19 files changed, 642 insertions, 634 deletions
diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle
index e80c6ad2..d6ad874e 100644
--- a/js/Events/ANDBLK.pickle
+++ b/js/Events/ANDBLK.pickle
@@ -11,20 +11,20 @@ S'diagram.objs[1-1]'
 p1
 S'object'
 p2
-sS'output_port.graphics.exprs'
+sS'x.gui'
 p3
 S'string'
 p4
-sS'this.x.model.rpar'
+sS'output_port.graphics.exprs'
 p5
-S'double'
-p6
+g4
 sS'input_port1'
-p7
+p6
 g2
 sS'diagram.objs[9-1]'
+p7
+S'double'
 p8
-g6
 sS'output_port.graphics.flip'
 p9
 S'boolean'
@@ -39,176 +39,176 @@ sS'input_port2.graphics.sz'
 p13
 S'vector'
 p14
-sS'input_port2.graphics.orig'
+sS'x.graphics.pein'
 p15
-g14
-sS'input_port1.graphics.flip'
+S'matrix'
 p16
-g10
-sS'split.graphics.orig'
+sS'input_port2.graphics.orig'
 p17
-S'matrix'
+g14
+sS'x.model.evtin'
 p18
-sS'ifthel'
+g16
+sS'input_port1.graphics.flip'
 p19
-g2
-sS'split.graphics.peout'
+g10
+sS'x.model.dep_ut'
 p20
-g18
-sS'output_port.graphics.pein'
+g14
+sS'split.graphics.orig'
 p21
-g6
-sS'diagram.objs[2-1]'
+g16
+sS'x.model.rpar'
 p22
-g2
-sS'andlog'
+g8
+sS'ifthel'
 p23
 g2
-sS'this.x.model.firing'
+sS'split.graphics.peout'
 p24
-g10
-sS'ifthel.graphics.pin'
+g16
+sS'output_port.graphics.pein'
 p25
-g6
-sS'output_port.model.ipar'
+g8
+sS'diagram.objs[2-1]'
 p26
-g6
-sS'typ'
+g2
+sS'andlog'
 p27
-g14
-sS'split.graphics.pein'
+g2
+sS'x.model.firing'
 p28
-g6
-sS'andlog.graphics.pein'
+g10
+sS'ifthel.graphics.pin'
 p29
-g18
-sS'this.x.graphics.pein'
+g8
+sS'output_port.model.ipar'
 p30
-g18
-sS'this.x.graphics.gr_i'
+g8
+sS'typ'
 p31
 g14
-sS'diagram.objs[7-1]'
+sS'split.graphics.pein'
 p32
-g2
-sS'diagram.objs[6-1]'
+g8
+sS'input_port2.graphics.flip'
 p33
-g6
-sS'split'
+g10
+sS'x.model.blocktype'
 p34
-g2
-sS'andlog.graphics.pout'
+g4
+sS'andlog.graphics.pein'
 p35
-g6
-sS'this.x.model.evtout'
+g16
+sS'x.graphics.peout'
 p36
-g6
-sS'this.x.model.sim'
+g8
+sS'diagram.objs[7-1]'
 p37
-g4
-sS'diagram.objs[8-1]'
+g2
+sS'diagram.objs[6-1]'
 p38
-g6
-sS'diagram.objs[3-1]'
+g8
+sS'split'
 p39
 g2
-sS'this.x.graphics.sz'
+sS'andlog.graphics.pout'
 p40
-g14
-sS'input_port1.graphics.sz'
+g8
+sS'diagram.objs[8-1]'
 p41
-g14
-sS'diagram.objs[5-1]'
+g8
+sS'diagram.objs[3-1]'
 p42
 g2
-sS'this.x'
+sS'input_port1.graphics.sz'
 p43
-g6
-sS'this.x.graphics.peout'
+g14
+sS'diagram.objs[5-1]'
 p44
-g6
+g2
 sS'andlog.graphics.orig'
 p45
 g14
 sS'diagram.objs[4-1]'
 p46
-g6
-sS'this.x.gui'
+g8
+sS'x.graphics.gr_i'
 p47
-g4
+g14
 sS'ifthel.graphics.pein'
 p48
-g6
+g8
 sS'ifthel.graphics.orig'
 p49
 g14
 sS'input_port2.model.ipar'
 p50
-g6
+g8
 sS'diagram'
 p51
-g6
+g8
 sS'input_port2.graphics.peout'
 p52
-g6
+g8
 sS'diagram.objs[10-1]'
 p53
 g2
-sS'this.x.model.dep_ut'
-p54
-g14
 sS'output_port.graphics.sz'
-p55
+p54
 g14
 sS'andlog.graphics.sz'
-p56
+p55
 g14
-sS'this.x.model.blocktype'
-p57
-g4
 sS'diagram.objs[12-1]'
-p58
-g6
+p56
+g8
 sS'ifthel.graphics.peout'
-p59
-g18
+p57
+g16
 sS'input_port1.graphics.orig'
-p60
+p58
 g14
+sS'x.model.sim'
+p59
+g4
 sS'output_port'
-p61
+p60
 g2
-sS'this.x.model.evtin'
-p62
-g18
 sS'andlog.graphics.flip'
-p63
+p61
 g10
 sS'input_port1.graphics.peout'
-p64
-g6
+p62
+g8
 sS'ifthel.graphics.sz'
-p65
+p63
 g14
 sS'ifthel.graphics.flip'
-p66
+p64
 g10
+sS'x.graphics.sz'
+p65
+g14
 sS'input_port1.model.ipar'
-p67
-g6
+p66
+g8
 sS'input_port2.graphics.exprs'
-p68
+p67
 g4
 sS'output_port.graphics.orig'
-p69
+p68
 g14
 sS'y'
-p70
+p69
 g14
-sS'input_port2.graphics.flip'
-p71
-g10
+sS'x'
+p70
+g8
 sS'diagram.objs[11-1]'
+p71
+g8
+sS'x.model.evtout'
 p72
-g6
+g8
 s.
 \ No newline at end of file
diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle
index 958d3133..497f51ed 100644
--- a/js/Events/ANDLOG_f.pickle
+++ b/js/Events/ANDLOG_f.pickle
@@ -7,32 +7,32 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.blocktype'
 p3
-S'string'
+g2
+sS'model.evtin'
 p4
-sS'model.blocktype'
+S'matrix'
 p5
-g4
-sS'model.evtin'
+sS'model.dep_ut'
 p6
-S'matrix'
+S'vector'
 p7
-sS'model.dep_ut'
+sS'model.out'
 p8
-S'vector'
+S'double'
 p9
-sS'model.out'
-p10
-g2
 sS'gr_i'
-p11
-g9
+p10
+g7
 sS'y'
+p11
+g7
+sS'x'
 p12
 g9
 sS'model'
@@ -41,8 +41,8 @@ S'object'
 p14
 sS'typ'
 p15
-g9
+g7
 sS'model.firing'
 p16
-g9
+g7
 s.
 \ No newline at end of file
diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle
index 549e736e..8958249b 100644
--- a/js/Events/CLKSOMV_f.pickle
+++ b/js/Events/CLKSOMV_f.pickle
@@ -7,45 +7,45 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'string'
+S'double'
 p4
-sS'model.evtout'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
-p6
-g4
 sS'model.evtin'
-p7
+p6
 S'matrix'
-p8
+p7
 sS'model.dep_ut'
-p9
+p8
 S'vector'
-p10
+p9
 sS'p'
-p11
-g2
+p10
+g4
 sS'gr_i'
-p12
-g10
+p11
+g9
 sS'y'
+p12
+g9
+sS'x'
 p13
-g10
+g4
 sS'model'
 p14
 S'object'
 p15
 sS'typ'
 p16
-g10
+g9
 sS'model.firing'
 p17
-g2
+g4
 s.
 \ No newline at end of file
diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle
index 549e736e..8958249b 100644
--- a/js/Events/CLKSOM_f.pickle
+++ b/js/Events/CLKSOM_f.pickle
@@ -7,45 +7,45 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'string'
+S'double'
 p4
-sS'model.evtout'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
-p6
-g4
 sS'model.evtin'
-p7
+p6
 S'matrix'
-p8
+p7
 sS'model.dep_ut'
-p9
+p8
 S'vector'
-p10
+p9
 sS'p'
-p11
-g2
+p10
+g4
 sS'gr_i'
-p12
-g10
+p11
+g9
 sS'y'
+p12
+g9
+sS'x'
 p13
-g10
+g4
 sS'model'
 p14
 S'object'
 p15
 sS'typ'
 p16
-g10
+g9
 sS'model.firing'
 p17
-g2
+g4
 s.
 \ No newline at end of file
diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle
index d5aa8014..8d8dc46f 100644
--- a/js/Events/CLKSPLIT_f.pickle
+++ b/js/Events/CLKSPLIT_f.pickle
@@ -7,29 +7,29 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'string'
+S'matrix'
 p4
-sS'model.evtout'
+sS'model.blocktype'
 p5
-S'matrix'
+g2
+sS'model.dep_ut'
 p6
-sS'model.blocktype'
+S'vector'
 p7
-g4
-sS'model.dep_ut'
+sS'model.evtin'
 p8
-S'vector'
+S'double'
 p9
-sS'model.evtin'
-p10
-g2
 sS'y'
+p10
+g7
+sS'x'
 p11
 g9
 sS'model'
@@ -38,8 +38,8 @@ S'object'
 p13
 sS'typ'
 p14
-g9
+g7
 sS'model.firing'
 p15
-g9
+g7
 s.
 \ No newline at end of file
diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle
index 48ad3e9e..98f3289d 100644
--- a/js/Events/END_c.pickle
+++ b/js/Events/END_c.pickle
@@ -9,59 +9,60 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'vector'
+S'double'
 p4
-sS'model.evtout'
-p5
-g2
 sS'model.evtin'
+p5
+g4
+sS'x.graphics'
 p6
-g2
-sS'this.x.graphics'
-p7
 S'object'
-p8
+p7
 sS'arg1'
-p9
-g8
+p8
+g7
 sS'graphics.exprs'
+p9
+NsS'model.dep_ut'
 p10
-NsS'model.blocktype'
+g2
+sS'tf'
 p11
-S'string'
+g4
+sS'exprs'
 p12
-sS'model.dep_ut'
+S'string'
 p13
-g4
-sS'this.x.model'
+sS'x.model'
 p14
-NsS'exprs'
+NsS'gr_i'
 p15
-g12
-sS'gr_i'
-p16
-g4
+g2
 sS'graphics'
-p17
-g8
+p16
+g7
 sS'y'
+p17
+g2
+sS'x'
 p18
 g4
 sS'model'
 p19
-g8
+g7
 sS'typ'
 p20
-g4
+g2
 sS'model.firing'
 p21
-NsS'this.tf'
+g4
+sS'model.blocktype'
 p22
-g2
+g13
 s.
 \ No newline at end of file
diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle
index 79bc2588..722994a2 100644
--- a/js/Events/EVTDLY_c.pickle
+++ b/js/Events/EVTDLY_c.pickle
@@ -11,69 +11,70 @@ p4
 atp5
 Rp6
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'vector'
+S'double'
 p4
-sS'model.evtout'
-p5
-g2
 sS'ok'
-p6
+p5
 S'boolean'
-p7
+p6
 sS'model.evtin'
+p7
+g4
+sS'x.graphics'
 p8
-g2
-sS'this.x.graphics'
-p9
 S'object'
-p10
+p9
 sS'arg1'
-p11
-g10
+p10
+g9
 sS'graphics.exprs'
-p12
+p11
 NsS'model.rpar'
-p13
+p12
 S'matrix'
+p13
+sS'exprs'
 p14
-sS'this.x.model'
+g13
+sS'x.model'
 p15
-NsS'exprs'
+NsS'gr_i'
 p16
-g14
-sS'gr_i'
-p17
-g4
+g2
 sS'model.dep_ut'
+p17
+g2
+sS'ff'
 p18
 g4
 sS'graphics'
 p19
-g10
+g9
 sS'y'
 p20
+g2
+sS'x'
+p21
 g4
 sS'model'
-p21
-g10
-sS'this.ff'
 p22
-g2
+g9
 sS'typ'
 p23
-g4
-sS'this.dt'
-p24
 g2
+sS'dt'
+p24
+g4
 sS'model.firing'
 p25
-NsS'model.blocktype'
+g4
+sS'model.blocktype'
 p26
 S'string'
 p27
diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle
index 88e964fa..dff4286c 100644
--- a/js/Events/EVTDLY_f.pickle
+++ b/js/Events/EVTDLY_f.pickle
@@ -11,68 +11,71 @@ p4
 atp5
 Rp6
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'string'
+S'double'
 p4
-sS'model.evtout'
-p5
-g2
 sS'ok'
-p6
+p5
 S'boolean'
-p7
+p6
 sS'model.evtin'
+p7
+g4
+sS'x.graphics'
 p8
-g2
-sS'this.x.graphics'
-p9
 S'object'
-p10
+p9
 sS'arg1'
-p11
-g10
+p10
+g9
 sS'graphics.exprs'
-p12
+p11
 NsS'model.rpar'
+p12
+g4
+sS'exprs'
 p13
-NsS'this.x.model'
+S'matrix'
 p14
-NsS'exprs'
+sS'x.model'
 p15
-S'matrix'
+NsS'gr_i'
 p16
-sS'gr_i'
-p17
 S'vector'
-p18
+p17
 sS'model.dep_ut'
+p18
+g17
+sS'ff'
 p19
-g18
+g4
 sS'graphics'
 p20
-g10
+g9
 sS'y'
 p21
-g18
-sS'model'
+g17
+sS'x'
 p22
-g10
-sS'this.ff'
+g4
+sS'model'
 p23
-NsS'typ'
+g9
+sS'typ'
 p24
-g18
-sS'this.dt'
+g17
+sS'dt'
 p25
-g2
+g4
 sS'model.firing'
 p26
-NsS'model.blocktype'
-p27
 g4
+sS'model.blocktype'
+p27
+g2
 s.
 \ No newline at end of file
diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle
index f917d6f9..d2e715ce 100644
--- a/js/Events/EVTGEN_f.pickle
+++ b/js/Events/EVTGEN_f.pickle
@@ -9,57 +9,58 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.evtout'
 p3
-S'string'
+S'double'
 p4
-sS'model.evtout'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
+sS'x.graphics'
 p6
-g4
-sS'this.x.graphics'
-p7
 S'object'
-p8
+p7
 sS'arg1'
+p8
+g7
+sS'tt'
 p9
-g8
+g4
 sS'graphics.exprs'
 p10
-NsS'this.tt'
+NsS'model.dep_ut'
 p11
-g2
-sS'model.dep_ut'
-p12
 S'vector'
+p12
+sS'exprs'
 p13
-sS'this.x.model'
+g2
+sS'x.model'
 p14
-g8
-sS'exprs'
-p15
-g4
+g7
 sS'gr_i'
-p16
-g13
+p15
+g12
 sS'graphics'
-p17
-g8
+p16
+g7
 sS'y'
+p17
+g12
+sS'x'
 p18
-g13
+g4
 sS'model'
 p19
-g8
+g7
 sS'typ'
 p20
-g13
+g12
 sS'model.firing'
 p21
-Ns.
-\ No newline at end of file
+g4
+s.
+\ No newline at end of file
diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle
index 432a491f..62147d8d 100644
--- a/js/Events/EVTVARDLY.pickle
+++ b/js/Events/EVTVARDLY.pickle
@@ -9,60 +9,60 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.evtin'
+p5
+g4
+sS'x.graphics'
 p6
-g2
-sS'this.x.graphics'
-p7
 S'object'
-p8
+p7
 sS'arg1'
-p9
-g8
+p8
+g7
 sS'graphics.exprs'
-p10
+p9
 NsS'model.evtout'
+p10
+g4
+sS'model.dep_ut'
 p11
 g2
-sS'model.dep_ut'
+sS'exprs'
 p12
-g4
-sS'this.x.model'
+S'string'
 p13
-NsS'exprs'
+sS'x.model'
 p14
-S'string'
+NsS'gr_i'
 p15
-sS'gr_i'
-p16
-g4
+g2
 sS'graphics'
-p17
-g8
+p16
+g7
 sS'y'
+p17
+g2
+sS'x'
 p18
 g4
 sS'model'
 p19
-g8
+g7
 sS'typ'
 p20
-g4
+g2
 sS'model.firing'
 p21
-g2
+g4
 sS'model.blocktype'
 p22
-g15
+g13
 s.
 \ No newline at end of file
diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle
index 9b9eab29..0d272b1c 100644
--- a/js/Events/HALT_f.pickle
+++ b/js/Events/HALT_f.pickle
@@ -9,60 +9,60 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.dstate'
 p3
-S'string'
+S'double'
 p4
-sS'model.dstate'
-p5
-g2
 sS'model.evtin'
+p5
+g4
+sS'x.graphics'
 p6
-g2
-sS'this.x.graphics'
-p7
 S'object'
-p8
+p7
 sS'arg1'
-p9
-g8
+p8
+g7
 sS'graphics.exprs'
-p10
+p9
 NsS'model.dep_ut'
-p11
+p10
 S'vector'
+p11
+sS'n'
 p12
-sS'this.x.model'
+g4
+sS'exprs'
 p13
-NsS'exprs'
+g2
+sS'x.model'
 p14
-g4
-sS'gr_i'
+NsS'gr_i'
 p15
-g12
-sS'this.n'
-p16
-g2
+g11
 sS'graphics'
-p17
-g8
+p16
+g7
 sS'y'
+p17
+g11
+sS'x'
 p18
-g12
+g4
 sS'model'
 p19
-g8
+g7
 sS'model.ipar'
 p20
-g2
+g4
 sS'typ'
 p21
-g12
+g11
 sS'model.blocktype'
 p22
-g4
+g2
 s.
 \ No newline at end of file
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index 79a67276..8c6f0c80 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -29,7 +29,7 @@ function IFTHEL_f() {
         return options;
     }
     IFTHEL_f.prototype.set = function IFTHEL_f() {
-        this.inh = parseFloat((arguments[0]["inh"]))
+        this.inh = inverse((arguments[0]["inh"]))
         this.nmod = parseFloat((arguments[0]["nmod"]))
         this.x = arg1;
         graphics = arg1.graphics;
diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle
index b1166c16..41611e51 100644
--- a/js/Events/IFTHEL_f.pickle
+++ b/js/Events/IFTHEL_f.pickle
@@ -11,89 +11,89 @@ p4
 atp5
 Rp6
 .(dp0
-S'this.nmod'
+S'arg1'
 p1
-S'double'
+S'object'
 p2
-sS'this.x.graphics'
+sS'graphics'
 p3
-S'object'
+g2
+sS'x.model'
 p4
-sS'arg1'
+NsS'model.intyp'
 p5
-g4
-sS'graphics'
+S'double'
 p6
-g4
-sS'model.intyp'
+sS'inh'
 p7
-g2
-sS'this.x.model'
+S'vector'
 p8
-NsS'this.inh'
+sS'nmod'
 p9
-S'vector'
+g6
+sS'model.in2'
 p10
+g6
 sS'model.in1'
 p11
+g6
+sS'x.graphics'
+p12
 g2
 sS'typ'
-p12
-g10
-sS'model.evtin'
 p13
-g2
-sS'model.sim[2-1]'
+g8
+sS'model.evtin'
 p14
-g2
-sS'model.firing'
+g6
+sS'exprs[2-1]'
 p15
-g10
-sS'this.x'
+S'string'
 p16
-g2
-sS'model.sim'
+sS'model.firing'
 p17
-g10
-sS'model.evtout'
+g8
+sS'model.sim'
 p18
-S'matrix'
+g8
+sS'model.evtout'
 p19
-sS'model.in2'
+S'matrix'
 p20
-g2
 sS'model.nmode'
 p21
-g2
+g6
 sS'graphics.exprs'
 p22
-S'string'
-p23
+g16
 sS'model.nzcross'
-p24
-g2
+p23
+g6
 sS'[model,graphics,ok]'
-p25
-g2
+p24
+g6
 sS'model.blocktype'
+p25
+g16
+sS'model.sim[2-1]'
 p26
-g23
-sS'exprs[2-1]'
-p27
-g23
+g6
 sS'model.dep_ut'
-p28
-g10
+p27
+g8
 sS'exprs'
-p29
-g19
+p28
+g20
 sS'gr_i'
-p30
-g10
+p29
+g8
 sS'y'
+p30
+g8
+sS'x'
 p31
-g10
+g6
 sS'model'
 p32
-g4
+g2
 s.
 \ No newline at end of file
diff --git a/js/Events/MCLOCK_f.pickle b/js/Events/MCLOCK_f.pickle
index 2c50e796..91caa32a 100644
--- a/js/Events/MCLOCK_f.pickle
+++ b/js/Events/MCLOCK_f.pickle
@@ -9,240 +9,240 @@ p3
 atp4
 Rp5
 .(dp0
-S'mfclck.graphics.exprs'
+S'output_port1.graphics.exprs'
 p1
-S'matrix'
+S'string'
 p2
-sS'diagram.objs[12-1]'
+sS'x.gui'
 p3
-S'double'
+g2
+sS'diagram.objs[12-1]'
 p4
-sS'this.x.model.evtout'
+S'double'
 p5
-g2
 sS'diagram.objs[1-1]'
 p6
 S'object'
 p7
-sS'output_port1.graphics.exprs'
+sS'arg1'
 p8
-S'string'
+g7
+sS'split2.graphics.pein'
 p9
-sS'arg1'
+g5
+sS'mfclck.graphics.orig'
 p10
-g7
-sS'this.x.graphics.sz'
-p11
 S'vector'
+p11
+sS'mfclck.model.firing'
 p12
-sS'split2.graphics.pein'
+g11
+sS'diagram.objs[7-1]'
 p13
-g4
-sS'mfclck.graphics.orig'
+g7
+sS'mfclck.graphics.sz'
 p14
-g12
-sS'mfclck.model.firing'
+g11
+sS'x.model.rpar'
 p15
-g12
-sS'diagram.objs[7-1]'
+g5
+sS'mfclck.graphics.peout'
 p16
-g7
-sS'this.x.model.blocktype'
+S'matrix'
 p17
-g9
-sS'mfclck.graphics.sz'
+sS'clksom.graphics.peout'
 p18
-g12
-sS'this.x.graphics.peout'
+g5
+sS'output_port2.graphics.exprs'
 p19
 g2
-sS'mfclck.graphics.peout'
-p20
-g2
-sS'clksom.graphics.peout'
-p21
-g4
-sS'output_port2.graphics.exprs'
-p22
-g9
 sS'diagram.objs[3-1]'
-p23
-g4
+p20
+g5
 sS'split2.graphics.orig'
-p24
-g2
+p21
+g17
 sS'output_port2.graphics.sz'
-p25
-g12
+p22
+g11
 sS'clksom.graphics.sz'
-p26
-g12
+p23
+g11
 sS'split2'
-p27
+p24
 g7
 sS'nn'
-p28
-g4
+p25
+g5
 sS'split1'
-p29
+p26
 g7
 sS'output_port1.graphics.orig'
+p27
+g11
+sS'x.model.evtout'
+p28
+g17
+sS'x.model.blocktype'
+p29
+g2
+sS'mfclck.graphics.flip'
 p30
-g12
-sS'this.x.model.rpar'
+S'boolean'
 p31
-g4
-sS'this.x.gui'
+sS'newpar[size(newpar)+1-1]'
 p32
-g9
-sS'mfclck.graphics.flip'
+NsS'x.graphics.peout'
 p33
-S'boolean'
-p34
-sS'newpar[size(newpar)+1-1]'
-p35
-NsS'this.x.graphics.gr_i'
-p36
-g12
+g17
 sS'gr_i'
-p37
-g12
+p34
+g11
 sS'diagram.objs[6-1]'
-p38
+p35
 g7
 sS'diagram.objs[5-1]'
-p39
-g4
+p36
+g5
 sS'diagram.objs[9-1]'
-p40
-g4
-sS'this.x.model.sim'
-p41
-g9
+p37
+g5
 sS'diagram.objs[8-1]'
-p42
+p38
 g7
 sS'clksom.graphics.exprs'
-p43
-g2
+p39
+g17
 sS'output_port1'
-p44
+p40
 g7
 sS'clksom'
-p45
+p41
 g7
 sS'output_port1.model.ipar'
-p46
-g4
-sS'this.x'
-p47
-g4
+p42
+g5
+sS'mfclck.graphics.exprs'
+p43
+g17
 sS'diagram.objs[2-1]'
-p48
+p44
 g7
 sS'clksom.graphics.pein'
-p49
-g2
+p45
+g17
 sS'spath'
-p50
-g12
+p46
+g11
 sS'diagram.objs[10-1]'
-p51
-g4
+p47
+g5
 sS'newpar'
-p52
-g12
+p48
+g11
 sS'diagram.objs[4-1]'
-p53
-g4
+p49
+g5
 sS'output_port2.model.ipar'
-p54
-g4
+p50
+g5
 sS'diagram.objs[13-1]'
-p55
-g4
+p51
+g5
 sS'output_port1.graphics.flip'
-p56
-g34
+p52
+g31
+sS'x.graphics.sz'
+p53
+g11
 sS'split1.graphics.pein'
-p57
-g4
+p54
+g5
 sS'arg1[spath-1]'
-p58
+p55
 NsS'output_port1.graphics.pein'
-p59
-g4
+p56
+g5
 sS'mfclck.model.ipar'
-p60
-g4
+p57
+g5
+sS'mfclck.model.rpar'
+p58
+g5
 sS'mfclck'
-p61
+p59
 g7
 sS'path'
-p62
+p60
 NsS'dt'
-p63
-g4
+p61
+g5
 sS'typ'
-p64
-g12
+p62
+g11
+sS'x.model.sim'
+p63
+g2
 sS'output_port2.graphics.flip'
-p65
-g34
+p64
+g31
 sS'arg1.model'
-p66
+p65
 g7
 sS'diagram.objs[11-1]'
-p67
+p66
 g7
 sS'diagram'
-p68
-g4
+p67
+g5
 sS'mfclck.graphics.pein'
-p69
-g4
+p68
+g5
 sS'clksom.graphics.orig'
-p70
-g12
+p69
+g11
 sS'split2.graphics.peout'
-p71
-g2
+p70
+g17
 sS'xx'
-p72
+p71
 g7
 sS'o'
-p73
+p72
 g7
 sS'output_port2.graphics.orig'
-p74
-g12
+p73
+g11
 sS'exprs'
-p75
-g2
+p74
+g17
 sS'output_port1.graphics.sz'
-p76
-g12
+p75
+g11
 sS'split1.graphics.orig'
-p77
-g2
+p76
+g17
 sS'output_port2.graphics.pein'
-p78
-g4
+p77
+g5
 sS'clksom.graphics.flip'
-p79
-g34
+p78
+g31
 sS'y'
+p79
+g5
+sS'x'
 p80
-g4
-sS'mfclck.model.rpar'
-p81
-g4
+g5
 sS'split1.graphics.peout'
-p82
-g2
+p81
+g17
 sS'output_port2'
-p83
+p82
 g7
+sS'x.graphics.gr_i'
+p83
+g11
 sS'arg1.model.rpar'
 p84
 g7
diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle
index 0f760a5a..cfe24411 100644
--- a/js/Events/MFCLCK_f.pickle
+++ b/js/Events/MFCLCK_f.pickle
@@ -22,66 +22,68 @@ p4
 sS'graphics'
 p5
 g4
-sS'this.x.model'
+sS'x.model'
 p6
 g4
-sS'this.nn'
+sS'hh[2-1]'
 p7
 g2
-sS'hh[2-1]'
+sS'nn'
 p8
 g2
-sS'typ'
+sS'x.graphics'
 p9
-S'vector'
-p10
+g4
 sS'model.evtin'
-p11
+p10
 g2
 sS'model.firing'
+p11
+S'vector'
 p12
-g10
-sS'this.x'
-p13
-g2
 sS'model.sim'
-p14
+p13
 S'string'
-p15
+p14
 sS'model.evtout'
-p16
+p15
 S'matrix'
-p17
+p16
 sS'model.rpar'
+p17
+g2
+sS'hh'
 p18
-NsS'hh'
-p19
 NsS'graphics.exprs'
+p19
+NsS'dt'
 p20
-NsS'model.ipar'
+g2
+sS'model.ipar'
 p21
-NsS'this.x.graphics'
+g2
+sS'typ'
 p22
-g4
+g12
 sS'model.blocktype'
 p23
-g15
+g14
 sS'model.dep_ut'
 p24
-g10
+g12
 sS'exprs'
 p25
-g17
+g16
 sS'gr_i'
 p26
-g10
+g12
 sS'y'
 p27
-g10
-sS'model'
+g12
+sS'x'
 p28
-g4
-sS'this.dt'
-p29
 g2
+sS'model'
+p29
+g4
 s.
 \ No newline at end of file
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js
index 437e100b..1c15a2e1 100644
--- a/js/Events/M_freq.js
+++ b/js/Events/M_freq.js
@@ -26,8 +26,8 @@ function M_freq() {
         return options;
     }
     M_freq.prototype.set = function M_freq() {
-        this.frequ = parseFloat((arguments[0]["frequ"]))
-        this.offset = parseFloat((arguments[0]["offset"]))
+        this.frequ = inverse((arguments[0]["frequ"]))
+        this.offset = inverse((arguments[0]["offset"]))
         this.x = arg1;
         graphics = arg1.graphics;
         model = arg1.model;
diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle
index 886f4d88..d7305484 100644
--- a/js/Events/M_freq.pickle
+++ b/js/Events/M_freq.pickle
@@ -19,10 +19,9 @@ S'arg1'
 p1
 S'object'
 p2
-sS'graphics'
+sS'graphics.exprs'
 p3
-g2
-sS'[m,den,off,count,m1,fir,this.frequ,this.offset,ok]'
+NsS'[m,den,off,count,m1,fir,this.frequ,this.offset,ok]'
 p4
 S'double'
 p5
@@ -30,86 +29,87 @@ sS'istreated'
 p6
 S'boolean'
 p7
-sS'this.x.model'
+sS'x.model'
 p8
 NsS'ind'
 p9
 g5
-sS'typ'
+sS'graphics'
 p10
-S'vector'
+g2
+sS'x.graphics'
 p11
+g2
 sS'model.evtin'
 p12
 g5
 sS'model.firing'
 p13
-g11
-sS'this.x'
+S'vector'
 p14
-g5
 sS'model.sim'
 p15
-g11
+g14
 sS'model.evtout'
 p16
 S'matrix'
 p17
 sS'model.rpar'
 p18
-g11
-sS'this.frequ'
+g14
+sS'graphics.sz'
 p19
-g11
-sS'graphics.exprs'
+g14
+sS'offset'
 p20
-NsS'this.offset'
+g14
+sS'typ'
 p21
-g11
-sS'graphics.sz'
-p22
-g11
-sS'this.x.graphics'
-p23
-g2
+g14
 sS'model.opar'
-p24
-g11
+p22
+g14
 sS'[model,graphics,ok]'
-p25
+p23
 g5
 sS'ok'
-p26
+p24
 g7
 sS'model.blocktype'
-p27
+p25
 S'string'
-p28
-sS'k'
-p29
-g17
+p26
+sS'frequ'
+p27
+g14
 sS'mn'
-p30
+p28
 g5
 sS'm'
-p31
+p29
 g17
 sS'model.dep_ut'
-p32
-g11
+p30
+g14
 sS'exprs'
-p33
+p31
 g17
 sS'gr_i'
-p34
-g11
+p32
+g14
 sS'y'
-p35
-g11
+p33
+g14
+sS'x'
+p34
+g5
 sS'model'
-p36
+p35
 g2
 sS'ot'
+p36
+g17
+sS'k'
 p37
 g17
 s.
 \ No newline at end of file
diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle
index 2f2f2443..2afe7018 100644
--- a/js/Events/VirtualCLK0.pickle
+++ b/js/Events/VirtualCLK0.pickle
@@ -7,44 +7,44 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.blocktype'
 p3
-S'string'
+g2
+sS'exprs'
 p4
-sS'model.blocktype'
+S'vector'
 p5
-g4
-sS'exprs'
+sS'model.dep_ut'
 p6
-S'vector'
+g5
+sS'model.evtin'
 p7
-sS'model.dep_ut'
+S'double'
 p8
-g7
-sS'model.evtin'
-p9
-g2
 sS'y'
+p9
+g5
+sS'x'
 p10
-g7
+g8
 sS'model'
 p11
 S'object'
 p12
 sS'model.ipar'
 p13
-g7
+g5
 sS'typ'
 p14
-g7
+g5
 sS'model.opar'
 p15
-g7
+g5
 sS'model.firing'
 p16
-g2
+g8
 s.
 \ No newline at end of file
diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle
index 9da8d4d3..871373c9 100644
--- a/js/Events/freq_div.pickle
+++ b/js/Events/freq_div.pickle
@@ -86,9 +86,9 @@ g2
 sS'scs_m_1.objs[2-1]'
 p28
 g8
-sS'this.x'
+sS'graphics.sz'
 p29
-g4
+g2
 sS'model.sim'
 p30
 S'string'
@@ -177,9 +177,9 @@ p60
 NsS'y'
 p61
 g4
-sS'graphics.sz'
+sS'x'
 p62
-g2
+g4
 sS'model'
 p63
 g8