fix var when assigning

30 files changed, 1130 insertions, 1125 deletions

diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index e13fd0ea..6d6e3506 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -39,7 +39,7 @@ function AFFICH_m() {
         return options;
     }
     AFFICH_m.prototype.set = function AFFICH_m() {
-        this.in1 = parseFloat((arguments[0]["in1"]))
+        this.in1 = inverse((arguments[0]["in1"]))
         this.font = parseFloat((arguments[0]["font"]))
         this.fontsize = parseFloat((arguments[0]["fontsize"]))
         this.colr = parseFloat((arguments[0]["colr"]))
diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle
index 4a7f5f88..85768c77 100644
--- a/js/Sinks/AFFICH_m.pickle
+++ b/js/Sinks/AFFICH_m.pickle
@@ -21,98 +21,98 @@ p9
 atp10
 Rp11
 .(dp0
-S'model.label'
+S'model.dstate'
 p1
-S'string'
+S'matrix'
 p2
-sS'this.nt'
+sS'arg1'
 p3
-S'double'
+S'object'
 p4
-sS'model.dstate'
+sS'graphics'
 p5
-S'matrix'
+g4
+sS'colr'
 p6
-sS'arg1'
+S'double'
 p7
-S'object'
+sS'x.model'
 p8
-sS'graphics'
+NsS'font'
 p9
-g8
-sS'this.fontsize'
+g7
+sS'model.in2'
 p10
-g4
-sS'this.nd'
+g7
+sS'model.in1'
 p11
-g4
-sS'this.x.model'
+g7
+sS'x.graphics'
 p12
-NsS'model.in2'
-p13
 g4
-sS'model.in1'
+sS'nd'
+p13
+g7
+sS'model.evtin'
 p14
-g4
-sS'this.x.graphics'
+g7
+sS'nt'
 p15
-g8
-sS'this.colr'
+g7
+sS'model.firing'
 p16
-g4
-sS'model.evtin'
+S'vector'
 p17
-g4
-sS'model.firing'
+sS'model.label'
 p18
-S'vector'
+S'string'
 p19
-sS'this.x'
-p20
-g4
 sS'model.sim'
-p21
-g19
+p20
+g17
 sS'mess'
+p21
+g2
+sS'in1'
 p22
-g6
-sS'this.in1'
+g17
+sS'fontsize'
 p23
-g19
+g7
 sS'graphics.exprs'
 p24
 NsS'model.ipar'
 p25
-g6
+g2
 sS'typ'
 p26
-g19
+g17
 sS'[model,graphics,ok]'
 p27
-g4
+g7
 sS'ok'
 p28
 S'boolean'
 p29
 sS'model.blocktype'
 p30
-g2
-sS'this.font'
-p31
-g4
-sS'model.dep_ut'
-p32
 g19
+sS'model.dep_ut'
+p31
+g17
 sS'exprs'
-p33
-g6
+p32
+g2
 sS'gr_i'
-p34
-g19
+p33
+g17
 sS'y'
+p34
+g17
+sS'x'
 p35
-g19
+g7
 sS'model'
 p36
-g8
+g4
 s.
\ No newline at end of file
diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle
index d2c2ea72..77eef456 100644
--- a/js/Sinks/BARXY.pickle
+++ b/js/Sinks/BARXY.pickle
@@ -24,83 +24,83 @@ p2
 sS'graphics'
 p3
 g2
-sS'this.x.model'
+sS'model.out'
 p4
-NsS'model.out'
-p5
 S'vector'
+p5
+sS'x.model'
 p6
-sS'model.in1'
+NsS'xmin'
 p7
-S'matrix'
+S'double'
 p8
-sS'model.ipar'
+sS'ymin'
 p9
-S'double'
+g8
+sS'model.in1'
 p10
-sS'this.ymin'
+S'matrix'
 p11
-g10
-sS'this.xmax'
+sS'ymax'
 p12
-g10
-sS'this.x.graphics.exprs'
-p13
 g8
-sS'this.x.graphics'
-p14
+sS'x.graphics'
+p13
 g2
-sS'this.ymax'
-p15
-g10
+sS'x.graphics.in_implicit'
+p14
+g5
 sS'model.evtin'
+p15
+g5
+sS'model.sim'
 p16
-g6
-sS'this.x.graphics.in_implicit'
+g5
+sS'mess'
 p17
-g6
-sS'this.x'
+g11
+sS'x.graphics.out_implicit'
 p18
-g10
-sS'model.sim'
+g5
+sS'model.intyp'
 p19
-g6
-sS'mess'
+g5
+sS'model.rpar'
 p20
-g8
-sS'model.intyp'
+g11
+sS'graphics.exprs'
 p21
-g6
-sS'model.rpar'
+NsS'model.ipar'
 p22
 g8
-sS'graphics.exprs'
+sS'typ'
 p23
-NsS'this.xmin'
+g5
+sS'ok'
 p24
-g10
-sS'typ'
+S'boolean'
 p25
-g6
-sS'ok'
+sS'model.blocktype'
 p26
-S'boolean'
+S'string'
 p27
-sS'model.blocktype'
+sS'model.dep_ut'
 p28
-S'string'
+g5
+sS'exprs'
 p29
-sS'model.dep_ut'
+NsS'x.graphics.exprs'
 p30
-g6
-sS'exprs'
+g11
+sS'xmax'
 p31
-NsS'this.x.graphics.out_implicit'
-p32
-g6
+g8
 sS'y'
+p32
+g5
+sS'x'
 p33
-g6
+g8
 sS'model'
 p34
 g2
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index dcbdd623..6473d23b 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -52,8 +52,8 @@ function CANIMXY() {
         this.clrs = parseFloat((arguments[0]["clrs"]))
         this.siz = parseFloat((arguments[0]["siz"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
         this.xmin = parseFloat((arguments[0]["xmin"]))
         this.xmax = parseFloat((arguments[0]["xmax"]))
         this.ymin = parseFloat((arguments[0]["ymin"]))
diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle
index fef0f097..5b769716 100644
--- a/js/Sinks/CANIMXY.pickle
+++ b/js/Sinks/CANIMXY.pickle
@@ -29,125 +29,125 @@ p13
 atp14
 Rp15
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'double'
 p2
-sS'graphics'
+sS'wpos'
 p3
-g2
-sS'rpar'
-p4
 S'matrix'
+p4
+sS'win'
 p5
-sS'this.siz'
+g2
+sS'wdim'
 p6
-S'double'
+g4
+sS'rpar'
 p7
-sS'model.intyp'
+g4
+sS'x.model'
 p8
-g5
-sS'this.x.model'
+NsS'model.intyp'
 p9
-NsS'this.wdim'
+g4
+sS'model.in1'
 p10
-g5
-sS'this.wpos'
+g4
+sS'xmin'
 p11
-g5
-sS'model.in1'
+g2
+sS'ymin'
 p12
-g5
-sS'this.xmin'
+g2
+sS'model.in2'
 p13
-g7
-sS'this.ymin'
+g4
+sS'graphics'
 p14
-g7
-sS'this.xmax'
+S'object'
 p15
-g7
-sS'typ'
+sS'ymax'
 p16
-S'vector'
+g2
+sS'x.graphics'
 p17
-sS'this.ymax'
+g15
+sS'siz'
 p18
-g7
-sS'this.win'
+g2
+sS'arg1'
 p19
-g7
-sS'this.clrs'
+g15
+sS'model.evtin'
 p20
-g7
-sS'this.nbr_curves'
+g2
+sS'model.firing'
 p21
-g7
-sS'model.evtin'
+S'vector'
 p22
-g7
-sS'model.firing'
+sS'model.sim'
 p23
-g17
-sS'this.x'
+g22
+sS'xmax'
 p24
-g7
-sS'model.sim'
+g2
+sS'mess'
 p25
-g17
-sS'this.N'
+g4
+sS'in1'
 p26
-g7
-sS'model.in2'
+S'string'
 p27
-g5
-sS'mess'
+sS'in2'
 p28
-g5
-sS'in1'
+g2
+sS'N'
 p29
-S'string'
+g2
+sS'model.rpar'
 p30
-sS'in2'
+g4
+sS'graphics.exprs'
 p31
-g7
-sS'model.rpar'
+NsS'model.ipar'
 p32
-g5
-sS'graphics.exprs'
+g4
+sS'typ'
 p33
-NsS'model.ipar'
+g22
+sS'[model,graphics,ok]'
 p34
-g5
-sS'this.x.graphics'
-p35
 g2
-sS'[model,graphics,ok]'
-p36
-g7
 sS'ok'
-p37
+p35
 S'boolean'
-p38
+p36
 sS'model.blocktype'
-p39
-g30
+p37
+g27
 sS'model.dep_ut'
-p40
-g17
+p38
+g22
 sS'exprs'
-p41
-g5
+p39
+g4
 sS'gr_i'
-p42
-g17
+p40
+g22
 sS'ipar'
-p43
-g5
+p41
+g4
 sS'y'
-p44
-g17
+p42
+g22
+sS'x'
+p43
+g2
 sS'model'
+p44
+g15
+sS'nbr_curves'
 p45
 g2
 s.
\ No newline at end of file
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index 24f50acb..6488cddc 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -49,15 +49,15 @@ function CANIMXY3D() {
     }
     CANIMXY3D.prototype.set = function CANIMXY3D() {
         this.nbr_curves = parseFloat((arguments[0]["nbr_curves"]))
-        this.clrs = parseFloat((arguments[0]["clrs"]))
-        this.siz = parseFloat((arguments[0]["siz"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
+        this.siz = inverse((arguments[0]["siz"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
-        this.vec_x = parseFloat((arguments[0]["vec_x"]))
-        this.vec_y = parseFloat((arguments[0]["vec_y"]))
-        this.vec_z = parseFloat((arguments[0]["vec_z"]))
-        this.param3ds = parseFloat((arguments[0]["param3ds"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
+        this.vec_x = inverse((arguments[0]["vec_x"]))
+        this.vec_y = inverse((arguments[0]["vec_y"]))
+        this.vec_z = inverse((arguments[0]["vec_z"]))
+        this.param3ds = inverse((arguments[0]["param3ds"]))
         this.N = parseFloat((arguments[0]["N"]))
         this.x = arg1;
         graphics = arg1.graphics;
diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle
index 3c40e739..85ea96f7 100644
--- a/js/Sinks/CANIMXY3D.pickle
+++ b/js/Sinks/CANIMXY3D.pickle
@@ -29,128 +29,128 @@ p13
 atp14
 Rp15
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'matrix'
 p2
-sS'graphics'
+sS'wpos'
 p3
 g2
-sS'rpar'
+sS'arg1'
 p4
-S'matrix'
+S'object'
 p5
-sS'this.siz'
+sS'wdim'
 p6
-g5
-sS'model.intyp'
+g2
+sS'rpar'
 p7
-g5
-sS'model.dep_ut'
+g2
+sS'x.model'
 p8
-S'vector'
+NsS'model.intyp'
 p9
-sS'this.x.model'
+g2
+sS'model.in1'
 p10
-NsS'this.wdim'
+g2
+sS'model.in2'
 p11
-g5
-sS'this.vec_z'
+g2
+sS'graphics'
 p12
 g5
-sS'this.vec_y'
+sS'x.graphics'
 p13
 g5
-sS'this.vec_x'
+sS'siz'
 p14
-g5
-sS'this.win'
+g2
+sS'vec_z'
 p15
-S'double'
+g2
+sS'win'
 p16
-sS'model.in1'
+S'double'
 p17
-g5
-sS'typ'
+sS'model.evtin'
 p18
-g9
-sS'this.wpos'
+g17
+sS'model.firing'
 p19
-g5
-sS'this.clrs'
+S'vector'
 p20
-g5
-sS'this.nbr_curves'
+sS'model.sim'
 p21
-g16
-sS'model.evtin'
+g20
+sS'mess'
 p22
-g16
-sS'model.firing'
+g2
+sS'vec_x'
 p23
-g9
-sS'this.x'
+g2
+sS'vec_y'
 p24
-g16
-sS'model.sim'
+g2
+sS'in1'
 p25
-g9
-sS'this.N'
+S'string'
 p26
-g16
-sS'model.in2'
+sS'in2'
 p27
-g5
-sS'mess'
+g17
+sS'N'
 p28
-g5
-sS'in1'
+g17
+sS'size_siz'
 p29
-S'string'
+g17
+sS'model.rpar'
 p30
-sS'in2'
+g2
+sS'graphics.exprs'
 p31
-g16
-sS'size_siz'
+NsS'model.ipar'
 p32
-g16
-sS'model.rpar'
+g2
+sS'typ'
 p33
-g5
-sS'graphics.exprs'
+g20
+sS'[model,graphics,ok]'
 p34
-NsS'model.ipar'
+g17
+sS'ok'
 p35
-g5
-sS'this.x.graphics'
+S'boolean'
 p36
-g2
-sS'[model,graphics,ok]'
+sS'model.blocktype'
 p37
-g16
-sS'ok'
+g26
+sS'param3ds'
 p38
-S'boolean'
+g2
+sS'model.dep_ut'
 p39
-sS'model.blocktype'
+g20
+sS'exprs'
 p40
-g30
-sS'this.param3ds'
+g2
+sS'gr_i'
 p41
-g5
-sS'exprs'
+g20
+sS'ipar'
 p42
-g5
-sS'gr_i'
+g2
+sS'y'
 p43
-g9
-sS'ipar'
+g20
+sS'x'
 p44
-g5
-sS'y'
-p45
-g9
+g17
 sS'model'
+p45
+g5
+sS'nbr_curves'
 p46
-g2
+g17
 s.
\ No newline at end of file
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index d2aebed0..bb514ece 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -35,10 +35,10 @@ function CEVENTSCOPE() {
     }
     CEVENTSCOPE.prototype.set = function CEVENTSCOPE() {
         this.nclock = parseFloat((arguments[0]["nclock"]))
-        this.clrs = parseFloat((arguments[0]["clrs"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
         this.per = parseFloat((arguments[0]["per"]))
         this.x = arg1;
         graphics = arg1.graphics;
diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle
index 358d8fc4..8b6148a9 100644
--- a/js/Sinks/CEVENTSCOPE.pickle
+++ b/js/Sinks/CEVENTSCOPE.pickle
@@ -19,90 +19,91 @@ p8
 atp9
 Rp10
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'matrix'
 p2
-sS'graphics'
+sS'wpos'
 p3
 g2
-sS'rpar'
+sS'arg1'
 p4
-NsS'this.x.model'
+S'object'
 p5
-NsS'this.wdim'
+sS'graphics.exprs'
 p6
-S'matrix'
+NsS'rpar'
 p7
-sS'this.win'
+NsS'x.model'
 p8
-S'double'
+NsS'graphics'
 p9
-sS'typ'
+g5
+sS'x.graphics'
 p10
-S'vector'
+g5
+sS'per'
 p11
-sS'this.wpos'
+S'double'
 p12
-g7
-sS'this.clrs'
+sS'win'
 p13
-g7
+g12
 sS'model.evtin'
 p14
-g9
-sS'this.x'
-p15
-g9
+g12
 sS'model.sim'
+p15
+S'vector'
 p16
-g11
-sS'this.per'
-p17
-g9
 sS'mess'
-p18
-g7
+p17
+g2
 sS'model.rpar'
+p18
+g12
+sS'wdim'
 p19
-NsS'graphics.exprs'
+g2
+sS'model.ipar'
 p20
-NsS'this.nclock'
+g2
+sS'typ'
 p21
-g9
-sS'model.ipar'
+g16
+sS'nclock'
 p22
-g7
-sS'this.x.graphics'
-p23
-g2
+g12
 sS'[model,graphics,ok]'
-p24
-g9
+p23
+g12
 sS'ok'
-p25
+p24
 S'boolean'
-p26
+p25
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 sS'model.dep_ut'
-p29
-g11
+p28
+g16
 sS'exprs'
-p30
-g7
+p29
+g2
 sS'gr_i'
-p31
-g11
+p30
+g16
 sS'ipar'
-p32
-g7
+p31
+g2
 sS'y'
+p32
+g16
+sS'x'
 p33
-g11
+g12
 sS'model'
 p34
-g2
+g5
 s.
\ No newline at end of file
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index 5d03d4db..4c3738d1 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -39,10 +39,10 @@ function CFSCOPE() {
         return options;
     }
     CFSCOPE.prototype.set = function CFSCOPE() {
-        this.clrs = parseFloat((arguments[0]["clrs"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
         this.ymin = parseFloat((arguments[0]["ymin"]))
         this.ymax = parseFloat((arguments[0]["ymax"]))
         this.per = parseFloat((arguments[0]["per"]))
diff --git a/js/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle
index 60d32739..7d3f93b7 100644
--- a/js/Sinks/CFSCOPE.pickle
+++ b/js/Sinks/CFSCOPE.pickle
@@ -25,101 +25,101 @@ p11
 atp12
 Rp13
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'matrix'
 p2
-sS'graphics'
+sS'wpos'
 p3
 g2
-sS'rpar'
+sS'arg1'
 p4
-S'matrix'
+S'object'
 p5
-sS'this.x.model'
+sS'graphics.exprs'
 p6
-NsS'this.wdim'
+NsS'rpar'
 p7
-g5
-sS'this.win'
+g2
+sS'x.model'
 p8
-S'double'
+NsS'ymin'
 p9
-sS'this.ymin'
+S'double'
 p10
-g9
-sS'typ'
+sS'graphics'
 p11
-S'vector'
+g5
+sS'ymax'
 p12
-sS'this.ymax'
+g10
+sS'x.graphics'
 p13
-g9
-sS'this.wpos'
-p14
 g5
-sS'this.clrs'
+sS'per'
+p14
+g10
+sS'win'
 p15
-g5
+g10
 sS'model.evtin'
 p16
-g9
+g10
 sS'model.firing'
 p17
-g12
-sS'this.x'
+S'vector'
 p18
-g9
 sS'model.sim'
 p19
-g12
-sS'this.N'
-p20
-g9
+g18
 sS'mess'
-p21
-g5
+p20
+g2
 sS'model.rpar'
+p21
+g2
+sS'N'
 p22
-g5
-sS'this.clrs[8-1]'
+g10
+sS'wdim'
 p23
-g9
-sS'graphics.exprs'
+g2
+sS'model.ipar'
 p24
-NsS'this.per'
+g2
+sS'typ'
 p25
-g9
-sS'model.ipar'
+g18
+sS'ok'
 p26
-g5
-sS'this.x.graphics'
+S'boolean'
 p27
-g2
-sS'ok'
+sS'model.blocktype'
 p28
-S'boolean'
+S'string'
 p29
-sS'model.blocktype'
+sS'clrs[8-1]'
 p30
-S'string'
-p31
+g10
 sS'model.dep_ut'
-p32
-g12
+p31
+g18
 sS'exprs'
-p33
-g5
+p32
+g2
 sS'gr_i'
-p34
-g12
+p33
+g18
 sS'ipar'
-p35
-g5
+p34
+g2
 sS'y'
+p35
+g18
+sS'x'
 p36
-g12
+g10
 sS'model'
 p37
-g2
+g5
 s.
\ No newline at end of file
diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle
index 5fe2717a..3f6a5ee8 100644
--- a/js/Sinks/CLKOUTV_f.pickle
+++ b/js/Sinks/CLKOUTV_f.pickle
@@ -40,99 +40,98 @@ p8
 g2
 sS'prt'
 p9
-NsS'coli'
+g2
+sS'x.model'
 p10
+g6
+sS'coli'
+p11
 g2
 sS'thick'
-p11
+p12
 g2
 sS'font'
-p12
+p13
 g2
 sS'orient'
-p13
-NsS'orig'
 p14
-NsS'pat'
+NsS'orig'
 p15
-g2
-sS'this.x.graphics'
+NsS'pat'
 p16
-g6
-sS'this.prt'
-p17
 g2
+sS'x.graphics'
+p17
+g6
 sS'model.evtin'
 p18
 g2
 sS'rectangle'
 p19
 g2
-sS'this.x'
-p20
-g2
 sS'model.sim'
-p21
+p20
 S'string'
-p22
+p21
 sS'yo'
-p23
+p22
 g2
 sS'arg1.graphics'
-p24
+p23
 g6
 sS'in1'
-p25
-g22
+p24
+g21
 sS'yf'
-p26
+p25
 g2
-sS'this.x.model'
-p27
-g6
 sS'graphics'
-p28
+p26
 g6
 sS'model.ipar'
-p29
-NsS'typ'
-p30
+p27
+g2
+sS'typ'
+p28
 S'vector'
-p31
+p29
 sS'sz'
-p32
+p30
 NsS'arg1.model'
-p33
+p31
 g6
 sS'ident'
-p34
+p32
 NsS'model.blocktype'
-p35
-g22
+p33
+g21
 sS'h'
-p36
+p34
 g2
 sS'model.dep_ut'
-p37
-g31
+p35
+g29
 sS'exprs'
-p38
-g22
+p36
+g21
 sS'gr_i'
-p39
+p37
 NsS'model.firing'
-p40
-g31
+p38
+g29
 sS'w'
-p41
+p39
 g2
 sS'y'
-p42
-g31
+p40
+g29
+sS'x'
+p41
+g2
 sS'model'
-p43
+p42
 g6
 sS'options'
-p44
+p43
 g6
 s.
\ No newline at end of file
diff --git a/js/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle
index f2b14ab2..6d7d48d4 100644
--- a/js/Sinks/CLKOUT_f.pickle
+++ b/js/Sinks/CLKOUT_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.blocktype'
 p3
-S'string'
+g2
+sS'prt'
 p4
-sS'model.blocktype'
+S'double'
 p5
-g4
-sS'this.x.graphics'
+sS'arg1'
 p6
 S'object'
 p7
-sS'arg1'
-p8
-g7
 sS'model.evtin'
-p9
-g2
+p8
+g5
 sS'model.dep_ut'
-p10
+p9
 S'vector'
+p10
+sS'exprs'
 p11
-sS'this.x.model'
+g2
+sS'x.model'
 p12
-NsS'exprs'
+NsS'graphics.exprs'
 p13
-g4
-sS'this.prt'
-p14
-g2
-sS'graphics.exprs'
-p15
-g2
+g5
 sS'graphics'
-p16
+p14
 g7
 sS'y'
-p17
-g11
+p15
+g10
+sS'x'
+p16
+g5
 sS'model'
-p18
+p17
 g7
 sS'model.ipar'
+p18
+g5
+sS'typ'
 p19
-NsS'typ'
+g10
+sS'x.graphics'
 p20
-g11
+g7
 sS'model.firing'
 p21
-g11
+g10
 s.
\ No newline at end of file
diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle
index 02f73ec0..2c85dba8 100644
--- a/js/Sinks/CMAT3D.pickle
+++ b/js/Sinks/CMAT3D.pickle
@@ -19,98 +19,98 @@ p8
 atp9
 Rp10
 .(dp0
-S'this.x.graphics'
+S'cmin'
 p1
-S'object'
+S'double'
 p2
 sS'arg1'
 p3
-g2
-sS'graphics'
+S'object'
 p4
-g2
-sS'size_c'
+sS'graphics'
 p5
-S'double'
+g4
+sS'size_c'
 p6
-sS'size_x'
+g2
+sS'x.model'
 p7
-g6
-sS'size_y'
+NsS'size_x'
 p8
-g6
-sS'this.x.model'
+g2
+sS'size_y'
 p9
-NsS'model.in2'
+g2
+sS'model.in2'
 p10
-g6
+g2
 sS'model.in1'
 p11
-g6
-sS'typ'
+g2
+sS'x.graphics'
 p12
-S'vector'
-p13
+g4
 sS'model.evtin'
+p13
+g2
+sS'model.sim'
 p14
-g6
-sS'this.x'
+S'vector'
 p15
-g6
-sS'model.sim'
+sS'colormap'
 p16
-g13
-sS'this.colormap'
-p17
-g6
+g2
 sS'mess'
-p18
+p17
 S'matrix'
-p19
+p18
 sS'model.intyp'
-p20
-g6
+p19
+g2
 sS'model.rpar'
-p21
-g19
+p20
+g18
 sS'rpar'
-p22
-g19
+p21
+g18
 sS'graphics.exprs'
-p23
+p22
 NsS'model.ipar'
+p23
+g18
+sS'typ'
 p24
-g19
-sS'this.cmax'
-p25
-g6
+g15
 sS'ok'
-p26
+p25
 S'boolean'
-p27
+p26
 sS'model.blocktype'
-p28
+p27
 S'string'
-p29
+p28
 sS'model.dep_ut'
-p30
-g13
+p29
+g15
 sS'exprs'
+p30
+g18
+sS'gr_i'
 p31
-g19
-sS'this.cmin'
+g15
+sS'ipar'
 p32
-g6
-sS'gr_i'
+g18
+sS'y'
 p33
-g13
-sS'ipar'
+g2
+sS'x'
 p34
-g19
-sS'y'
-p35
-g6
+g2
 sS'model'
+p35
+g4
+sS'cmax'
 p36
 g2
 s.
\ No newline at end of file
diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle
index e32fbd70..ba289a81 100644
--- a/js/Sinks/CMATVIEW.pickle
+++ b/js/Sinks/CMATVIEW.pickle
@@ -15,101 +15,101 @@ p6
 atp7
 Rp8
 .(dp0
-S'this.x.graphics'
+S'cmin'
 p1
-S'object'
+S'double'
 p2
 sS'arg1'
 p3
-g2
-sS'graphics'
+S'object'
 p4
-g2
-sS'sol'
+sS'graphics'
 p5
-S'string'
+g4
+sS'sol'
 p6
-sS'size_c'
+S'string'
 p7
-S'double'
+sS'size_c'
 p8
-sS'this.x.model'
+g2
+sS'x.model'
 p9
-NsS'model.in2'
+NsS'colormap'
 p10
-g8
-sS'model.in1'
+g2
+sS'model.in2'
 p11
-g8
-sS'typ'
+g2
+sS'model.in1'
 p12
-S'vector'
+g2
+sS'x.graphics'
 p13
+g4
 sS'beta_c'
 p14
-g8
+g2
 sS'model.evtin'
 p15
-g8
-sS'this.x'
-p16
-g8
+g2
 sS'model.sim'
+p16
+S'vector'
 p17
-g13
-sS'this.colormap'
-p18
-g8
 sS'alpha_c'
-p19
-g8
+p18
+g2
 sS'mess'
-p20
+p19
 S'matrix'
-p21
+p20
 sS'model.intyp'
-p22
-g8
+p21
+g2
 sS'model.rpar'
-p23
-g21
+p22
+g20
 sS'rpar'
-p24
-g21
+p23
+g20
 sS'graphics.exprs'
-p25
+p24
 NsS'model.ipar'
+p25
+g20
+sS'typ'
 p26
-g21
-sS'this.cmax'
-p27
-g8
+g17
 sS'ok'
-p28
+p27
 S'boolean'
-p29
+p28
 sS'model.blocktype'
-p30
-g6
+p29
+g7
 sS'model.dep_ut'
-p31
-g13
+p30
+g17
 sS'exprs'
+p31
+g20
+sS'gr_i'
 p32
-g21
-sS'this.cmin'
+g17
+sS'ipar'
 p33
-g8
-sS'gr_i'
+g20
+sS'y'
 p34
-g13
-sS'ipar'
+g17
+sS'x'
 p35
-g21
-sS'y'
-p36
-g13
+g2
 sS'model'
+p36
+g4
+sS'cmax'
 p37
 g2
 s.
\ No newline at end of file
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index c0bf502b..2192a6b7 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -47,14 +47,14 @@ function CMSCOPE() {
         return options;
     }
     CMSCOPE.prototype.set = function CMSCOPE() {
-        this.in1 = parseFloat((arguments[0]["in1"]))
-        this.clrs = parseFloat((arguments[0]["clrs"]))
+        this.in1 = inverse((arguments[0]["in1"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
-        this.ymin = parseFloat((arguments[0]["ymin"]))
-        this.ymax = parseFloat((arguments[0]["ymax"]))
-        this.per = parseFloat((arguments[0]["per"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
+        this.ymin = inverse((arguments[0]["ymin"]))
+        this.ymax = inverse((arguments[0]["ymax"]))
+        this.per = inverse((arguments[0]["per"]))
         this.N = parseFloat((arguments[0]["N"]))
         this.heritance = parseFloat((arguments[0]["heritance"]))
         this.nom = parseFloat((arguments[0]["nom"]))
diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle
index 65446ab2..5cefa80a 100644
--- a/js/Sinks/CMSCOPE.pickle
+++ b/js/Sinks/CMSCOPE.pickle
@@ -29,128 +29,129 @@ p13
 atp14
 Rp15
 .(dp0
-S'model.label'
+S'clrs'
 p1
-NsS'model.dstate'
+S'matrix'
 p2
-S'vector'
+sS'model.dstate'
 p3
-sS'arg1'
+S'vector'
 p4
-S'object'
+sS'wpos'
 p5
-sS'graphics.exprs'
+g2
+sS'arg1'
 p6
-NsS'period'
+S'object'
 p7
-g3
-sS'rpar'
+sS'graphics'
 p8
-S'matrix'
+g7
+sS'period'
 p9
-sS'this.x.model'
+g4
+sS'rpar'
 p10
-NsS'this.wdim'
+g2
+sS'x.model'
 p11
-g9
-sS'this.win'
+NsS'model.intyp'
 p12
-S'double'
+g2
+sS'ymin'
 p13
-sS'model.in1'
+g2
+sS'model.in2'
 p14
-NsS'this.ymin'
+g2
+sS'model.in1'
 p15
-g9
-sS'this.x.graphics'
+g2
+sS'ymax'
 p16
-g5
-sS'this.ymax'
+g2
+sS'x.graphics'
 p17
-g9
-sS'this.wpos'
+g7
+sS'graphics.exprs'
 p18
-g9
-sS'this.clrs'
+NsS'per'
 p19
-g9
-sS'model.evtin'
+g2
+sS'win'
 p20
-g13
-sS'graphics.id'
+S'double'
 p21
-NsS'this.x'
+sS'model.evtin'
 p22
-g13
-sS'model.sim'
+g21
+sS'graphics.id'
 p23
-g3
-sS'this.N'
+NsS'model.label'
 p24
-g13
-sS'model.in2'
+NsS'model.sim'
 p25
-g9
+g4
 sS'mess'
 p26
-g9
-sS'model.intyp'
+g2
+sS'in1'
 p27
-g9
+g2
 sS'in2'
 p28
-g13
-sS'yy'
+g21
+sS'N'
 p29
-g9
-sS'this.in1'
+g21
+sS'yy'
 p30
-g9
+g2
 sS'model.rpar'
 p31
-g9
-sS'graphics'
+g2
+sS'wdim'
 p32
-g5
-sS'this.per'
-p33
-g9
+g2
 sS'model.ipar'
-p34
-g9
+p33
+g2
 sS'typ'
-p35
-g3
+p34
+g4
 sS'a'
-p36
-g13
+p35
+g21
 sS'[model,graphics,ok]'
-p37
-g13
+p36
+g21
 sS'ok'
-p38
+p37
 S'boolean'
-p39
+p38
 sS'model.blocktype'
-p40
+p39
 S'string'
-p41
+p40
 sS'model.dep_ut'
-p42
-g3
+p41
+g4
 sS'exprs'
-p43
-g9
+p42
+g2
 sS'gr_i'
-p44
-g3
+p43
+g4
 sS'ipar'
-p45
-g9
+p44
+g2
 sS'y'
+p45
+g4
+sS'x'
 p46
-g3
+g21
 sS'model'
 p47
-g5
+g7
 s.
\ No newline at end of file
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index b63d1a34..4726b9c9 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -42,10 +42,10 @@ function CSCOPE() {
         return options;
     }
     CSCOPE.prototype.set = function CSCOPE() {
-        this.clrs = parseFloat((arguments[0]["clrs"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
         this.ymin = parseFloat((arguments[0]["ymin"]))
         this.ymax = parseFloat((arguments[0]["ymax"]))
         this.per = parseFloat((arguments[0]["per"]))
diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle
index 5090838b..cdc0fc5c 100644
--- a/js/Sinks/CSCOPE.pickle
+++ b/js/Sinks/CSCOPE.pickle
@@ -27,108 +27,108 @@ p12
 atp13
 Rp14
 .(dp0
-S'model.label'
+S'clrs'
 p1
-NsS'arg1'
+S'matrix'
 p2
-S'object'
+sS'wpos'
 p3
-sS'graphics.exprs'
+g2
+sS'arg1'
 p4
-NsS'rpar'
+S'object'
 p5
-S'matrix'
+sS'graphics.exprs'
 p6
-sS'this.x.model'
+NsS'rpar'
 p7
-NsS'this.wdim'
+g2
+sS'x.model'
 p8
-g6
-sS'this.win'
+NsS'ymin'
 p9
 S'double'
 p10
-sS'model.in1'
+sS'model.in2'
 p11
 g10
-sS'this.ymin'
+sS'graphics'
 p12
-g10
-sS'typ'
+g5
+sS'ymax'
 p13
-S'vector'
+g10
+sS'x.graphics'
 p14
-sS'this.ymax'
+g5
+sS'per'
 p15
 g10
-sS'this.wpos'
+sS'win'
 p16
-g6
-sS'this.clrs'
-p17
-g6
+g10
 sS'model.evtin'
-p18
+p17
 g10
 sS'graphics.id'
+p18
+NsS'model.label'
 p19
-NsS'this.x'
+NsS'model.sim'
 p20
-g10
-sS'model.sim'
+S'vector'
 p21
-g14
-sS'this.N'
+sS'mess'
 p22
-g10
-sS'model.in2'
+g2
+sS'model.in1'
 p23
 g10
-sS'mess'
-p24
-g6
 sS'model.rpar'
+p24
+g2
+sS'N'
 p25
-g6
-sS'graphics'
-p26
-g3
-sS'this.per'
-p27
 g10
+sS'wdim'
+p26
+g2
 sS'model.ipar'
+p27
+g2
+sS'typ'
 p28
-g6
-sS'this.x.graphics'
-p29
-g3
+g21
 sS'[model,graphics,ok]'
-p30
+p29
 g10
 sS'ok'
-p31
+p30
 S'boolean'
-p32
+p31
 sS'model.blocktype'
-p33
+p32
 S'string'
-p34
+p33
 sS'model.dep_ut'
-p35
-g14
+p34
+g21
 sS'exprs'
-p36
-g6
+p35
+g2
 sS'gr_i'
-p37
-g14
+p36
+g21
 sS'ipar'
-p38
-g6
+p37
+g2
 sS'y'
+p38
+g21
+sS'x'
 p39
-g14
+g10
 sS'model'
 p40
-g3
+g5
 s.
\ No newline at end of file
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index 8abd9616..71082262 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -51,8 +51,8 @@ function CSCOPXY() {
         this.clrs = parseFloat((arguments[0]["clrs"]))
         this.siz = parseFloat((arguments[0]["siz"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
         this.xmin = parseFloat((arguments[0]["xmin"]))
         this.xmax = parseFloat((arguments[0]["xmax"]))
         this.ymin = parseFloat((arguments[0]["ymin"]))
diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle
index c959e545..866d8dfd 100644
--- a/js/Sinks/CSCOPXY.pickle
+++ b/js/Sinks/CSCOPXY.pickle
@@ -29,122 +29,122 @@ p13
 atp14
 Rp15
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'double'
 p2
-sS'graphics'
+sS'wpos'
 p3
-g2
-sS'rpar'
-p4
 S'matrix'
+p4
+sS'win'
 p5
-sS'this.siz'
+g2
+sS'wdim'
 p6
-S'double'
+g4
+sS'rpar'
 p7
-sS'model.intyp'
+g4
+sS'x.model'
 p8
-g5
-sS'this.x.model'
+NsS'model.intyp'
 p9
-NsS'this.wdim'
+g4
+sS'model.in1'
 p10
-g5
-sS'this.wpos'
+g4
+sS'xmin'
 p11
-g5
-sS'model.in1'
+g2
+sS'ymin'
 p12
-g5
-sS'this.xmin'
+g2
+sS'model.in2'
 p13
-g7
-sS'this.ymin'
+g4
+sS'graphics'
 p14
-g7
-sS'this.xmax'
+S'object'
 p15
-g7
-sS'typ'
+sS'ymax'
 p16
-S'vector'
+g2
+sS'x.graphics'
 p17
-sS'this.ymax'
+g15
+sS'siz'
 p18
-g7
-sS'this.win'
+g2
+sS'arg1'
 p19
-g7
-sS'this.clrs'
+g15
+sS'model.evtin'
 p20
-g7
-sS'this.nbr_curves'
+g2
+sS'model.sim'
 p21
-g7
-sS'model.evtin'
+S'vector'
 p22
-g7
-sS'this.x'
+sS'xmax'
 p23
-g7
-sS'model.sim'
+g2
+sS'mess'
 p24
-g17
-sS'this.N'
+g4
+sS'in1'
 p25
-g7
-sS'model.in2'
+S'string'
 p26
-g5
-sS'mess'
+sS'in2'
 p27
-g5
-sS'in1'
+g2
+sS'N'
 p28
-S'string'
+g2
+sS'model.rpar'
 p29
-sS'in2'
+g4
+sS'graphics.exprs'
 p30
-g7
-sS'model.rpar'
+NsS'model.ipar'
 p31
-g5
-sS'graphics.exprs'
+g4
+sS'typ'
 p32
-NsS'model.ipar'
+g22
+sS'[model,graphics,ok]'
 p33
-g5
-sS'this.x.graphics'
-p34
 g2
-sS'[model,graphics,ok]'
-p35
-g7
 sS'ok'
-p36
+p34
 S'boolean'
-p37
+p35
 sS'model.blocktype'
-p38
-g29
+p36
+g26
 sS'model.dep_ut'
-p39
-g17
+p37
+g22
 sS'exprs'
-p40
-g5
+p38
+g4
 sS'gr_i'
-p41
-g17
+p39
+g22
 sS'ipar'
-p42
-g5
+p40
+g4
 sS'y'
-p43
-g17
+p41
+g22
+sS'x'
+p42
+g2
 sS'model'
+p43
+g15
+sS'nbr_curves'
 p44
 g2
 s.
\ No newline at end of file
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 0f66a073..59e254ad 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -48,15 +48,15 @@ function CSCOPXY3D() {
     }
     CSCOPXY3D.prototype.set = function CSCOPXY3D() {
         this.nbr_curves = parseFloat((arguments[0]["nbr_curves"]))
-        this.clrs = parseFloat((arguments[0]["clrs"]))
-        this.siz = parseFloat((arguments[0]["siz"]))
+        this.clrs = inverse((arguments[0]["clrs"]))
+        this.siz = inverse((arguments[0]["siz"]))
         this.win = parseFloat((arguments[0]["win"]))
-        this.wpos = parseFloat((arguments[0]["wpos"]))
-        this.wdim = parseFloat((arguments[0]["wdim"]))
-        this.vec_x = parseFloat((arguments[0]["vec_x"]))
-        this.vec_y = parseFloat((arguments[0]["vec_y"]))
-        this.vec_z = parseFloat((arguments[0]["vec_z"]))
-        this.param3ds = parseFloat((arguments[0]["param3ds"]))
+        this.wpos = inverse((arguments[0]["wpos"]))
+        this.wdim = inverse((arguments[0]["wdim"]))
+        this.vec_x = inverse((arguments[0]["vec_x"]))
+        this.vec_y = inverse((arguments[0]["vec_y"]))
+        this.vec_z = inverse((arguments[0]["vec_z"]))
+        this.param3ds = inverse((arguments[0]["param3ds"]))
         this.N = parseFloat((arguments[0]["N"]))
         this.x = arg1;
         graphics = arg1.graphics;
diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle
index 173c1b8f..6c11c475 100644
--- a/js/Sinks/CSCOPXY3D.pickle
+++ b/js/Sinks/CSCOPXY3D.pickle
@@ -29,125 +29,125 @@ p13
 atp14
 Rp15
 .(dp0
-S'arg1'
+S'clrs'
 p1
-S'object'
+S'matrix'
 p2
-sS'graphics'
+sS'wpos'
 p3
 g2
-sS'rpar'
+sS'arg1'
 p4
-S'matrix'
+S'object'
 p5
-sS'this.siz'
+sS'wdim'
 p6
-g5
-sS'model.intyp'
+g2
+sS'rpar'
 p7
-g5
-sS'model.dep_ut'
+g2
+sS'x.model'
 p8
-S'vector'
+NsS'model.intyp'
 p9
-sS'this.x.model'
+g2
+sS'model.in1'
 p10
-NsS'this.wdim'
+g2
+sS'model.in2'
 p11
-g5
-sS'this.vec_z'
+g2
+sS'graphics'
 p12
 g5
-sS'this.vec_y'
+sS'x.graphics'
 p13
 g5
-sS'this.vec_x'
+sS'siz'
 p14
-g5
-sS'this.win'
+g2
+sS'vec_z'
 p15
-S'double'
+g2
+sS'win'
 p16
-sS'model.in1'
+S'double'
 p17
-g5
-sS'typ'
+sS'model.evtin'
 p18
-g9
-sS'this.wpos'
+g17
+sS'model.sim'
 p19
-g5
-sS'this.clrs'
+S'vector'
 p20
-g5
-sS'this.nbr_curves'
+sS'mess'
 p21
-g16
-sS'model.evtin'
+g2
+sS'vec_x'
 p22
-g16
-sS'this.x'
+g2
+sS'vec_y'
 p23
-g16
-sS'model.sim'
+g2
+sS'in1'
 p24
-g9
-sS'this.N'
+S'string'
 p25
-g16
-sS'model.in2'
+sS'in2'
 p26
-g5
-sS'mess'
+g17
+sS'N'
 p27
-g5
-sS'in1'
+g17
+sS'size_siz'
 p28
-S'string'
+g17
+sS'model.rpar'
 p29
-sS'in2'
+g2
+sS'graphics.exprs'
 p30
-g16
-sS'size_siz'
+NsS'model.ipar'
 p31
-g16
-sS'model.rpar'
+g2
+sS'typ'
 p32
-g5
-sS'graphics.exprs'
+g20
+sS'[model,graphics,ok]'
 p33
-NsS'model.ipar'
+g17
+sS'ok'
 p34
-g5
-sS'this.x.graphics'
+S'boolean'
 p35
-g2
-sS'[model,graphics,ok]'
+sS'model.blocktype'
 p36
-g16
-sS'ok'
+g25
+sS'param3ds'
 p37
-S'boolean'
+g2
+sS'model.dep_ut'
 p38
-sS'model.blocktype'
+g20
+sS'exprs'
 p39
-g29
-sS'this.param3ds'
+g2
+sS'gr_i'
 p40
-g5
-sS'exprs'
+g20
+sS'ipar'
 p41
-g5
-sS'gr_i'
+g2
+sS'y'
 p42
-g9
-sS'ipar'
+g20
+sS'x'
 p43
-g5
-sS'y'
-p44
-g9
+g17
 sS'model'
+p44
+g5
+sS'nbr_curves'
 p45
-g2
+g17
 s.
\ No newline at end of file
diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle
index 42e2fa43..79131fd4 100644
--- a/js/Sinks/OUTIMPL_f.pickle
+++ b/js/Sinks/OUTIMPL_f.pickle
@@ -20,68 +20,68 @@ sS'mo.model'
 p4
 S'string'
 p5
-sS'this.x.model'
+sS'prt'
 p6
-g2
-sS'model.in2'
+S'double'
 p7
-S'vector'
+sS'x.model'
 p8
-sS'model.in1'
+g2
+sS'model.in2'
 p9
-g8
-sS'typ'
+S'vector'
 p10
-g8
-sS'mo.inputs'
+sS'model.in1'
 p11
-g5
-sS'this.prt'
+g10
+sS'x.graphics'
 p12
-S'double'
+g2
+sS'mo.inputs'
 p13
-sS'this.x.graphics.in_implicit'
+g5
+sS'x.graphics.in_implicit'
 p14
-g8
-sS'this.x'
-p15
-g13
+g10
 sS'model.sim'
-p16
+p15
 g5
 sS'model.equations'
-p17
-g13
+p16
+g7
 sS'graphics.exprs'
-p18
-g13
+p17
+g7
 sS'model.ipar'
+p18
+g10
+sS'typ'
 p19
-g8
-sS'this.x.graphics'
-p20
-g2
+g10
 sS'needcompile'
-p21
-g13
+p20
+g7
 sS'model.blocktype'
-p22
+p21
 g5
 sS'mo'
-p23
-g13
+p22
+g7
 sS'model.dep_ut'
-p24
-g8
+p23
+g10
 sS'exprs'
-p25
+p24
 g5
 sS'gr_i'
-p26
-g8
+p25
+g10
 sS'y'
+p26
+g7
+sS'x'
 p27
-g13
+g7
 sS'model'
 p28
 g2
diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle
index e8fe8c63..1ba039dd 100644
--- a/js/Sinks/OUT_f.pickle
+++ b/js/Sinks/OUT_f.pickle
@@ -9,7 +9,7 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.in2'
 p1
 S'double'
 p2
@@ -23,52 +23,53 @@ g2
 sS'model.blocktype'
 p6
 g4
-sS'model.in2'
+sS'prt'
 p7
 g2
-sS'this.x.graphics'
+sS'arg1'
 p8
 S'object'
 p9
-sS'arg1'
-p10
-g9
 sS'graphics.exprs'
-p11
+p10
 g2
 sS'model.intyp'
-p12
+p11
 g2
 sS'model.dep_ut'
-p13
+p12
 S'vector'
-p14
+p13
 sS'n'
-p15
+p14
 g2
-sS'this.x.model'
+sS'exprs'
+p15
+g4
+sS'x.model'
 p16
-NsS'exprs'
+NsS'gr_i'
 p17
-g4
-sS'gr_i'
-p18
-g14
-sS'this.prt'
-p19
-g2
+g13
 sS'graphics'
-p20
+p18
 g9
 sS'y'
-p21
-g14
+p19
+g13
+sS'x'
+p20
+g2
 sS'model'
-p22
+p21
 g9
 sS'model.ipar'
+p22
+g2
+sS'typ'
 p23
-NsS'typ'
+g13
+sS'x.graphics'
 p24
-g14
+g9
 s.
\ No newline at end of file
diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle
index 69373eac..3fd146ce 100644
--- a/js/Sinks/TOWS_c.pickle
+++ b/js/Sinks/TOWS_c.pickle
@@ -22,93 +22,93 @@ p2
 sS'graphics'
 p3
 g2
-sS'this.nz'
+sS'ierr'
 p4
 S'double'
 p5
-sS'ierr'
+sS'x.model'
 p6
-g5
-sS'this.x.model'
-p7
 NsS'model.out'
-p8
+p7
 S'vector'
+p8
+sS'varnam'
 p9
-sS'model.in2'
+S'string'
 p10
+sS'model.in2'
+p11
 g5
 sS'model.in1'
-p11
-g9
-sS'typ'
 p12
-g9
-sS'gr_i'
+g8
+sS'herit'
 p13
-g9
-sS'model.evtin'
+g5
+sS'x.graphics'
 p14
-g9
-sS'nu'
+g2
+sS'nz'
 p15
 g5
-sS'model.firing'
+sS'gr_i'
 p16
-g9
-sS'this.x'
+g8
+sS'model.evtin'
 p17
-g5
-sS'model.sim'
+g8
+sS'nu'
 p18
-g9
-sS'model.evtout'
+g5
+sS'model.firing'
 p19
-g9
-sS'this.herit'
+g8
+sS'model.sim'
 p20
-g5
-sS'this.varnam'
+g8
+sS'model.evtout'
 p21
-S'string'
-p22
+g8
 sS'model.intyp'
-p23
+p22
 g5
 sS'model.rpar'
-p24
-g9
+p23
+g8
 sS'graphics.exprs'
-p25
+p24
 NsS'model.ipar'
-p26
+p25
 S'matrix'
+p26
+sS'typ'
 p27
-sS'this.x.graphics'
-p28
-g2
+g8
 sS'[model,graphics,ok]'
-p29
+p28
 g5
 sS'ok'
-p30
+p29
 S'boolean'
-p31
+p30
 sS'model.blocktype'
-p32
-g22
+p31
+g10
 sS'model.dep_ut'
-p33
-g9
+p32
+g8
 sS'exprs'
-p34
-g27
+p33
+g26
 sS'r'
-p35
-g31
+p34
+g30
 sS'y'
+p35
+g8
+sS'x'
 p36
-g9
+g5
 sS'model'
 p37
 g2
diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle
index 96c42878..e56faa0c 100644
--- a/js/Sinks/TRASH_f.pickle
+++ b/js/Sinks/TRASH_f.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.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
-p6
-g4
 sS'exprs'
+p6
+g2
+sS'in1'
 p7
 g4
-sS'in1'
-p8
-g2
 sS'model.dep_ut'
-p9
+p8
 S'vector'
-p10
+p9
 sS'model.evtin'
-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
 s.
\ No newline at end of file
diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle
index a17c9969..7bc34bab 100644
--- a/js/Sinks/WFILE_f.pickle
+++ b/js/Sinks/WFILE_f.pickle
@@ -32,96 +32,97 @@ p5
 NsS'dstate'
 p6
 g2
-sS'this.x.model'
+sS'x.model'
 p7
 g4
-sS'[pa,fn,ex]'
+sS'model.dep_ut'
 p8
-S'double'
+S'vector'
 p9
-sS'warnMessage'
+sS'[pa,fn,ex]'
 p10
-g9
-sS'this.x.graphics'
+S'double'
 p11
-g4
-sS'lunit'
+sS'warnMessage'
 p12
-g9
-sS'this.fname1'
+g11
+sS'x.graphics'
 p13
-g9
-sS'fname'
+g4
+sS'lunit'
 p14
-S'string'
+g11
+sS'fname'
 p15
-sS'frmt'
+S'string'
 p16
-g15
-sS'model.evtin'
+sS'frmt'
 p17
-g9
-sS'this.x'
+g16
+sS'model.evtin'
 p18
-g9
+g11
 sS'model.sim'
 p19
-g15
+g16
 sS'nin'
 p20
-g9
-sS'this.N'
+g11
+sS'in1'
 p21
-g9
-sS'this.frmt1'
-p22
-g9
+g11
 sS'model.in1'
+p22
+g11
+sS'warnAdvise'
 p23
-NsS'y'
+g11
+sS'warnXcosMessage'
 p24
-S'vector'
+g11
+sS'graphics'
 p25
-sS'warnAdvise'
+g4
+sS'model.ipar'
 p26
-g9
-sS'warnXcosMessage'
+g2
+sS'typ'
 p27
 g9
-sS'graphics'
+sS'arg1.model'
 p28
 g4
-sS'model.ipar'
+sS'ok'
 p29
-g2
-sS'typ'
+S'boolean'
 p30
-g25
-sS'arg1.model'
+sS'model.blocktype'
 p31
-g4
-sS'ok'
+g16
+sS'frmt1'
 p32
-S'boolean'
+g11
+sS'fname1'
 p33
-sS'model.blocktype'
-p34
-g15
-sS'model.dep_ut'
-p35
-g25
+g11
 sS'exprs'
-p36
+p34
 g2
+sS'N'
+p35
+g11
 sS'gr_i'
-p37
-g25
+p36
+g9
 sS'ipar'
-p38
+p37
 g2
-sS'this.in1'
-p39
+sS'y'
+p38
 g9
+sS'x'
+p39
+g11
 sS'model'
 p40
 g4
diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle
index 6502595c..385fa47f 100644
--- a/js/Sinks/WRITEAU_f.pickle
+++ b/js/Sinks/WRITEAU_f.pickle
@@ -23,32 +23,32 @@ sS'arg1'
 p3
 S'object'
 p4
-sS'this.swap'
-p5
-S'double'
-p6
 sS'graphics'
-p7
+p5
 g4
 sS'dstate'
-p8
+p6
 g2
+sS'x.model'
+p7
+g4
 sS'model.dep_ut'
-p9
+p8
 S'vector'
+p9
+sS'model.in1'
 p10
-sS'this.x.model'
+S'double'
 p11
-g4
-sS'model.in1'
+sS'x.graphics'
 p12
-g6
-sS'this.x.graphics'
-p13
 g4
 sS'lunit'
+p13
+g11
+sS'swap'
 p14
-g6
+g11
 sS'fname'
 p15
 S'string'
@@ -58,55 +58,55 @@ p17
 g16
 sS'model.evtin'
 p18
-g6
-sS'this.x'
-p19
-g6
+g11
 sS'model.sim'
-p20
-g10
+p19
+g9
 sS'nin'
+p20
+g11
+sS'in1'
 p21
-g6
-sS'this.N'
+g11
+sS'N'
 p22
-g6
-sS'in1'
-p23
-g6
+g11
 sS'graphics.exprs'
-p24
+p23
 NsS'model.ipar'
-p25
+p24
 g2
 sS'typ'
-p26
-g10
+p25
+g9
 sS'ok'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'model.blocktype'
-p29
+p28
 g16
 sS'frmt1'
-p30
+p29
 g16
 sS'fname1'
-p31
+p30
 g16
 sS'exprs'
-p32
-g10
+p31
+g9
 sS'gr_i'
-p33
-g10
+p32
+g9
 sS'ipar'
-p34
+p33
 g2
 sS'y'
+p34
+g9
+sS'x'
 p35
-g10
+g11
 sS'model'
 p36
 g4
diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle
index e23a4781..17706b57 100644
--- a/js/Sinks/WRITEC_f.pickle
+++ b/js/Sinks/WRITEC_f.pickle
@@ -31,95 +31,96 @@ sS'arg1'
 p3
 S'object'
 p4
-sS'this.swap'
+sS'graphics.exprs'
 p5
-S'double'
+NsS'dstate'
 p6
-sS'graphics.exprs'
+g2
+sS'x.model'
 p7
-NsS'dstate'
+g4
+sS'model.dep_ut'
 p8
-g2
-sS'this.x.model'
+S'vector'
 p9
-g4
 sS'[pa,fn,ex]'
 p10
-g6
-sS'model.in1'
+S'double'
 p11
-NsS'this.x.graphics'
+sS'model.in1'
 p12
+g11
+sS'x.graphics'
+p13
 g4
 sS'lunit'
-p13
-g6
-sS'this.fname1'
 p14
-g6
-sS'fname'
+g11
+sS'swap'
 p15
-S'string'
+g11
+sS'fname'
 p16
-sS'frmt'
+S'string'
 p17
-g16
-sS'model.evtin'
+sS'frmt'
 p18
-g6
-sS'this.x'
+g17
+sS'model.evtin'
 p19
-g6
+g11
 sS'model.sim'
 p20
-S'vector'
-p21
+g9
 sS'nin'
+p21
+g11
+sS'fmts'
 p22
-g6
-sS'this.N'
+g9
+sS'in1'
 p23
-g6
-sS'fmts'
+g11
+sS'N'
 p24
-g21
-sS'this.frmt1'
-p25
-g16
-sS'y'
-p26
-g21
+g11
 sS'graphics'
-p27
+p25
 g4
 sS'model.ipar'
-p28
+p26
 g2
 sS'typ'
-p29
-g21
+p27
+g9
 sS'ok'
-p30
+p28
 S'boolean'
-p31
+p29
 sS'model.blocktype'
+p30
+g17
+sS'frmt1'
+p31
+g17
+sS'fname1'
 p32
-g16
-sS'model.dep_ut'
-p33
-g21
+g11
 sS'exprs'
-p34
+p33
 g2
 sS'gr_i'
-p35
-g21
+p34
+g9
 sS'ipar'
-p36
+p35
 g2
-sS'this.in1'
+sS'y'
+p36
+g9
+sS'x'
 p37
-g6
+g11
 sS'model'
 p38
 g4