support arg1 parsing

38 files changed, 1335 insertions, 1386 deletions

diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle
index a1957198..ee7960b9 100644
--- a/js/Linear/BIGSOM_f.pickle
+++ b/js/Linear/BIGSOM_f.pickle
@@ -33,45 +33,43 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'in1'
-p13
+p12
 g6
 sS'model.rpar'
-p14
+p13
 g2
 sS'exprs'
-p15
+p14
 g8
 sS'x.model'
-p16
+p15
 NsS'gr_i'
-p17
+p16
 S'vector'
-p18
+p17
 sS'model.dep_ut'
-p19
+p18
 S'vector_boolean'
-p20
+p19
 sS'model.in'
-p21
+p20
 g2
 sS'graphics'
-p22
+p21
 g10
 sS'y'
-p23
-g18
+p22
+g17
 sS'x'
+p23
+g17
+sS'model'
 p24
-NsS'model'
-p25
 g10
 sS'typ'
-p26
-g18
+p25
+g17
 s.
\ No newline at end of file
diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle
index 51140ca2..8c5667b1 100644
--- a/js/Linear/CLINDUMMY_f.pickle
+++ b/js/Linear/CLINDUMMY_f.pickle
@@ -36,7 +36,8 @@ p11
 g8
 sS'x'
 p12
-NsS'x0'
+g8
+sS'x0'
 p13
 g10
 sS'typ'
diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle
index 39082dd4..28ecc146 100644
--- a/js/Linear/CLR.pickle
+++ b/js/Linear/CLR.pickle
@@ -15,108 +15,106 @@ p6
 atp7
 Rp8
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'B'
-p7
+p6
 S'double'
-p8
+p7
 sS'model.out'
-p9
-g8
+p8
+g7
 sS'x0[ns1-1][1-1]'
-p10
-g8
+p9
+g7
 sS'x.graphics'
-p11
+p10
 g2
 sS'ns'
-p12
-g8
+p11
+g7
 sS'A'
-p13
-g8
+p12
+g7
 sS'model.sim'
-p14
+p13
 S'list'
-p15
+p14
 sS'C'
-p16
-g8
+p15
+g7
 sS'PREVAR_scicos_context.s'
-p17
-g8
+p16
+g7
 sS'nin'
-p18
-g8
+p17
+g7
 sS'D'
-p19
-g8
+p18
+g7
 sS'H'
-p20
-g8
+p19
+g7
 sS'model.rpar'
-p21
-g5
+p20
+g4
 sS'mmm'
-p22
+p21
 S'vector_boolean'
-p23
+p22
 sS'model.state'
-p24
-g8
+p23
+g7
 sS'model.in'
-p25
-g8
+p24
+g7
 sS'graphics.exprs'
-p26
+p25
 NsS'x0'
-p27
-g8
+p26
+g7
 sS'typ'
-p28
+p27
 S'vector'
-p29
+p28
 sS'ok'
-p30
+p29
 S'boolean'
-p31
+p30
 sS'model.blocktype'
-p32
+p31
 S'string'
-p33
+p32
 sS'model.dep_ut'
-p34
-g23
+p33
+g22
 sS'exprs'
-p35
-g5
+p34
+g4
 sS'gr_i'
-p36
-g29
+p35
+g28
 sS'PREVAR_scicos_context'
-p37
+p36
 NsS'y'
-p38
-g29
+p37
+g28
 sS'x'
+p38
+g28
+sS'model'
 p39
-NsS'model'
-p40
 g2
 sS'nout'
-p41
-g8
+p40
+g7
 s.
\ No newline at end of file
diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle
index 39082dd4..28ecc146 100644
--- a/js/Linear/CLR_f.pickle
+++ b/js/Linear/CLR_f.pickle
@@ -15,108 +15,106 @@ p6
 atp7
 Rp8
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'B'
-p7
+p6
 S'double'
-p8
+p7
 sS'model.out'
-p9
-g8
+p8
+g7
 sS'x0[ns1-1][1-1]'
-p10
-g8
+p9
+g7
 sS'x.graphics'
-p11
+p10
 g2
 sS'ns'
-p12
-g8
+p11
+g7
 sS'A'
-p13
-g8
+p12
+g7
 sS'model.sim'
-p14
+p13
 S'list'
-p15
+p14
 sS'C'
-p16
-g8
+p15
+g7
 sS'PREVAR_scicos_context.s'
-p17
-g8
+p16
+g7
 sS'nin'
-p18
-g8
+p17
+g7
 sS'D'
-p19
-g8
+p18
+g7
 sS'H'
-p20
-g8
+p19
+g7
 sS'model.rpar'
-p21
-g5
+p20
+g4
 sS'mmm'
-p22
+p21
 S'vector_boolean'
-p23
+p22
 sS'model.state'
-p24
-g8
+p23
+g7
 sS'model.in'
-p25
-g8
+p24
+g7
 sS'graphics.exprs'
-p26
+p25
 NsS'x0'
-p27
-g8
+p26
+g7
 sS'typ'
-p28
+p27
 S'vector'
-p29
+p28
 sS'ok'
-p30
+p29
 S'boolean'
-p31
+p30
 sS'model.blocktype'
-p32
+p31
 S'string'
-p33
+p32
 sS'model.dep_ut'
-p34
-g23
+p33
+g22
 sS'exprs'
-p35
-g5
+p34
+g4
 sS'gr_i'
-p36
-g29
+p35
+g28
 sS'PREVAR_scicos_context'
-p37
+p36
 NsS'y'
-p38
-g29
+p37
+g28
 sS'x'
+p38
+g28
+sS'model'
 p39
-NsS'model'
-p40
 g2
 sS'nout'
-p41
-g8
+p40
+g7
 s.
\ No newline at end of file
diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle
index 582ebfbc..2832365a 100644
--- a/js/Linear/CLSS.pickle
+++ b/js/Linear/CLSS.pickle
@@ -21,95 +21,93 @@ p9
 atp10
 Rp11
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
-g8
+p8
+g7
 sS'x.graphics'
-p10
+p9
 g2
 sS'A'
-p11
-g8
+p10
+g7
 sS'model.sim'
-p12
+p11
 S'list'
-p13
+p12
 sS'C'
-p14
-g8
+p13
+g7
 sS'B'
-p15
-g8
+p14
+g7
 sS'D'
-p16
-g8
+p15
+g7
 sS'in1'
-p17
-g8
+p16
+g7
 sS'model.rpar'
-p18
-g5
+p17
+g4
 sS'mmm'
-p19
+p18
 S'vector_boolean'
-p20
+p19
 sS'model.state'
-p21
-g8
+p20
+g7
 sS'model.in'
-p22
-g8
+p21
+g7
 sS'graphics.exprs'
-p23
-g8
+p22
+g7
 sS'x0'
-p24
-g8
+p23
+g7
 sS'typ'
-p25
+p24
 S'vector'
-p26
+p25
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 sS'model.dep_ut'
-p29
-g20
+p28
+g19
 sS'exprs'
-p30
-g5
+p29
+g4
 sS'gr_i'
-p31
-g26
+p30
+g25
 sS'okD'
-p32
+p31
 S'boolean'
-p33
+p32
 sS'y'
-p34
-g26
+p33
+g25
 sS'x'
+p34
+g25
+sS'model'
 p35
-NsS'model'
-p36
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle
index 7ae568f9..5cf80320 100644
--- a/js/Linear/CLSS_f.pickle
+++ b/js/Linear/CLSS_f.pickle
@@ -21,91 +21,89 @@ p9
 atp10
 Rp11
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
-g8
+p8
+g7
 sS'x.graphics'
-p10
+p9
 g2
 sS'A'
-p11
-g8
+p10
+g7
 sS'model.sim'
-p12
+p11
 S'list'
-p13
+p12
 sS'C'
-p14
-g8
+p13
+g7
 sS'B'
-p15
-g8
+p14
+g7
 sS'D'
-p16
-g8
+p15
+g7
 sS'in1'
-p17
-g8
+p16
+g7
 sS'model.rpar'
-p18
-g5
+p17
+g4
 sS'mmm'
-p19
+p18
 S'vector_boolean'
-p20
+p19
 sS'model.state'
-p21
-g8
+p20
+g7
 sS'model.in'
-p22
-g8
+p21
+g7
 sS'graphics.exprs'
-p23
-g8
+p22
+g7
 sS'x0'
-p24
-g8
+p23
+g7
 sS'typ'
-p25
+p24
 S'vector'
-p26
+p25
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 sS'model.dep_ut'
-p29
-g20
+p28
+g19
 sS'exprs'
-p30
-g5
+p29
+g4
 sS'gr_i'
-p31
-g26
+p30
+g25
 sS'y'
-p32
-g26
+p31
+g25
 sS'x'
+p32
+g25
+sS'model'
 p33
-NsS'model'
-p34
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle
index fbf11c3a..30e34615 100644
--- a/js/Linear/DELAYV_f.pickle
+++ b/js/Linear/DELAYV_f.pickle
@@ -21,87 +21,85 @@ S'model.dstate'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'zz0'
-p6
+p5
 S'vector'
-p7
+p6
 sS'x.model'
-p8
+p7
 g4
 sS'model.out'
-p9
+p8
 g2
 sS'x.graphics'
-p10
+p9
 g4
 sS'typ'
-p11
-g7
+p10
+g6
 sS'model.evtin'
-p12
+p11
 g2
 sS'model.firing'
-p13
-g7
+p12
+g6
 sS'told'
-p14
+p13
 g2
 sS'model.sim'
-p15
+p14
 S'list'
-p16
+p15
 sS'model.evtout'
-p17
+p16
 S'matrix'
-p18
+p17
 sS'nin'
-p19
+p18
 g2
 sS'model.rpar'
-p20
+p19
 g2
 sS'T'
-p21
+p20
 g2
 sS'model.in'
-p22
-g18
+p21
+g17
 sS'graphics.exprs'
-p23
+p22
 NsS'z0'
-p24
+p23
 g2
 sS'ok'
-p25
+p24
 S'boolean'
-p26
+p25
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 sS'model.dep_ut'
-p29
+p28
 S'vector_boolean'
-p30
+p29
 sS'exprs'
-p31
-g18
+p30
+g17
 sS'gr_i'
-p32
-g7
+p31
+g6
 sS'y'
-p33
-g7
+p32
+g6
 sS'x'
+p33
+g6
+sS'model'
 p34
-NsS'model'
-p35
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js
index 49bed7b4..ee4b8dae 100644
--- a/js/Linear/DELAY_f.js
+++ b/js/Linear/DELAY_f.js
@@ -70,6 +70,8 @@ function DELAY_f() {
     }
     DELAY_f.prototype.get = function DELAY_f() {
         var ppath = list(0,0);
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
                 ppath[1-1] = i;
             }
@@ -95,6 +97,8 @@ function DELAY_f() {
     }
     DELAY_f.prototype.set = function DELAY_f() {
         var ppath = list(0,0);
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
                 ppath[1-1] = i;
             }
diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle
index bf1c5cbe..632568d0 100644
--- a/js/Linear/DELAY_f.pickle
+++ b/js/Linear/DELAY_f.pickle
@@ -73,19 +73,19 @@ g2
 sS'x.graphics.out_implicit'
 p24
 g15
-sS'ppath[1-1]'
+sS'model.rpar'
 p25
-NsS'output_port.graphics.sz'
+g2
+sS'ppath[1-1]'
 p26
-S'vector'
+NsS'output_port.graphics.sz'
 p27
-sS'register.graphics.pout'
+S'vector'
 p28
+sS'register.graphics.pout'
+p29
 g4
 sS'output_port'
-p29
-g2
-sS'arg1.model'
 p30
 g2
 sS'input_port.graphics.pout'
@@ -96,192 +96,189 @@ p32
 g4
 sS'x.graphics.sz'
 p33
-g27
+g28
 sS'output_port.graphics.pin'
 p34
 g4
 sS'x'
 p35
 g4
-sS'arg1.model.rpar'
+sS'evtdly.model'
 p36
 g2
-sS'evtdly.model'
+sS'diagram.objs[9-1]'
 p37
-g2
-sS'arg1'
-p38
-g2
+g4
 sS'evtdly.graphics.sz'
-p39
-g27
+p38
+g28
 sS'register.graphics.sz'
-p40
-g27
+p39
+g28
 sS'x.graphics.in_style'
-p41
+p40
 g6
 sS'output_port.model.ipar'
-p42
+p41
 g4
 sS'evtdly_exprs'
-p43
+p42
 NsS'input_port.graphics.sz'
-p44
-g27
+p43
+g28
 sS'register.model'
-p45
+p44
 g2
 sS'diagram.objs[2-1]'
-p46
+p45
 g2
 sS'diagram.objs[4-1]'
-p47
+p46
 g2
 sS'diagram.objs[10-1]'
-p48
+p47
 g4
 sS'evtdly.graphics.exprs'
-p49
+p48
 g8
 sS'ok'
-p50
+p49
 g19
 sS'x.model.in'
-p51
+p50
 g4
 sS'input_port'
-p52
+p51
 g2
 sS'evtdly.graphics.orig'
-p53
-g27
+p52
+g28
 sS'output_port.graphics.exprs'
-p54
+p53
 g8
 sS'ppath'
-p55
+p54
 g22
 sS'output_port.graphics.flip'
-p56
+p55
 g19
 sS'x.model'
-p57
+p56
 g2
 sS'x.model.rpar'
-p58
+p57
 g4
 sS'x.model.rpar.objs[ppath[2-1]-1]'
-p59
+p58
 g2
 sS'evtdly.graphics.exprs[1-1]'
-p60
+p59
 g4
 sS'x.graphics.gr_i'
-p61
-g27
+p60
+g28
 sS'x.model.blocktype'
-p62
+p61
 g6
 sS'register.graphics.orig'
-p63
-g27
-sS'diagram.objs[9-1]'
-p64
-g4
+p62
+g28
 sS'input_port.graphics.orig'
-p65
-g27
+p63
+g28
 sS'input_port.graphics.exprs'
-p66
+p64
 g8
 sS'input_port.model.ipar'
-p67
+p65
 g4
 sS'x.model.rpar.objs[ppath[1-1]-1]'
-p68
+p66
 g2
 sS'x.model.sim'
-p69
+p67
 g6
 sS'evtdly.graphics.peout'
-p70
+p68
 g4
 sS'register.model.dstate'
-p71
-g27
+p69
+g28
 sS'split.graphics.peout'
-p72
+p70
 g8
 sS'x.model.dep_ut'
-p73
+p71
 S'vector_boolean'
-p74
+p72
 sS'o'
-p75
+p73
 g2
 sS'evtdly.graphics.pein'
-p76
+p74
 g4
 sS'diagram.objs[3-1]'
-p77
+p75
 g2
 sS'evtdly.graphics.flip'
-p78
+p76
 g19
 sS'register.graphics.pin'
-p79
+p77
 g4
 sS'ppath[2-1]'
-p80
+p78
 NsS'diagram.objs[6-1]'
-p81
+p79
 g4
 sS'split'
-p82
+p80
 g2
 sS'register_exprs'
-p83
+p81
 NsS'diagram.objs[8-1]'
-p84
+p82
 g2
 sS'mess'
-p85
+p83
 g8
 sS'diagram'
-p86
+p84
 g4
 sS'y'
-p87
+p85
 g4
 sS'newpar[$+1-1]'
-p88
+p86
 g4
 sS'register.graphics'
-p89
+p87
 g2
 sS'typ'
-p90
+p88
 g22
 sS'register.graphics.exprs'
-p91
+p89
 g6
 sS'x.graphics.pout'
-p92
+p90
 g4
 sS'register'
-p93
+p91
 g2
 sS'exprs'
-p94
+p92
 g8
 sS'output_port.graphics.orig'
-p95
-g27
+p93
+g28
 sS'x.graphics.pin'
-p96
+p94
 g4
+sS'model'
+p95
+g2
 sS'register.graphics.flip'
-p97
+p96
 g19
 s.
\ No newline at end of file
diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle
index cbe22810..b4c9ebcb 100644
--- a/js/Linear/DERIV.pickle
+++ b/js/Linear/DERIV.pickle
@@ -42,7 +42,8 @@ p13
 g6
 sS'x'
 p14
-NsS'model'
+g6
+sS'model'
 p15
 S'object'
 p16
diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle
index a0e60696..f2fb1b25 100644
--- a/js/Linear/DIFF_c.pickle
+++ b/js/Linear/DIFF_c.pickle
@@ -15,78 +15,76 @@ p6
 atp7
 Rp8
 .(dp0
-S'arg1'
+S'graphics.exprs'
 p1
-S'object'
+NsS'x.model'
 p2
-sS'graphics'
+NsS'xd0'
 p3
-g2
-sS'x.model'
+S'vector'
 p4
-NsS'xd0'
+sS'model.out'
 p5
-S'vector'
+S'double'
 p6
-sS'model.out'
+sS'x.model.firing'
 p7
-S'double'
+g4
+sS'x.graphics'
 p8
-sS'x.model.firing'
+S'object'
 p9
-g6
-sS'x.graphics'
-p10
-g2
 sS'model.sim'
-p11
+p10
 S'list'
-p12
+p11
 sS'N'
-p13
-g8
+p12
+g6
 sS'Nxd'
-p14
-g8
+p13
+g6
 sS'model.state'
-p15
+p14
 S'matrix'
-p16
+p15
 sS'model.in'
+p16
+g6
+sS'graphics'
 p17
-g8
-sS'graphics.exprs'
+g9
+sS'x0'
 p18
-NsS'x0'
-p19
-g16
+g15
 sS'typ'
-p20
-g6
+p19
+g4
 sS'model.blocktype'
-p21
+p20
 S'string'
-p22
+p21
 sS'model.dep_ut'
-p23
+p22
 S'vector_boolean'
-p24
+p23
 sS'exprs'
-p25
-g16
+p24
+g15
 sS'gr_i'
-p26
-g6
+p25
+g4
 sS'ask_again'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'y'
-p29
-g6
+p28
+g4
 sS'x'
+p29
+g4
+sS'model'
 p30
-NsS'model'
-p31
-g2
+g9
 s.
\ No newline at end of file
diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle
index f172c461..889de53f 100644
--- a/js/Linear/DLR.pickle
+++ b/js/Linear/DLR.pickle
@@ -19,104 +19,102 @@ S'model.dstate'
 p1
 S'vector'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'rpar'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'x.model'
-p8
+p7
 g4
 sS'model.out'
-p9
+p8
 S'double'
-p10
+p9
 sS'x0[ns1-1][1-1]'
-p11
-g10
+p10
+g9
 sS'x.model.firing'
-p12
+p11
 g2
 sS'x.graphics'
-p13
+p12
 g4
 sS'model.evtin'
-p14
-g10
+p13
+g9
 sS'ns'
-p15
-g10
+p14
+g9
 sS'A'
-p16
-g10
+p15
+g9
 sS'model.sim'
-p17
+p16
 S'list'
-p18
+p17
 sS'C'
-p19
-g10
+p18
+g9
 sS'B'
-p20
-g10
+p19
+g9
 sS'D'
-p21
-g10
+p20
+g9
 sS'H'
-p22
-g10
+p21
+g9
 sS'PREVAR_scicos_context.z'
-p23
-g10
+p22
+g9
 sS'model.rpar'
-p24
-g7
+p23
+g6
 sS'mmm'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'model.in'
-p27
-g10
+p26
+g9
 sS'graphics.exprs'
-p28
+p27
 NsS'x0'
-p29
-g10
+p28
+g9
 sS'typ'
-p30
+p29
 g2
 sS'ok'
-p31
+p30
 S'boolean'
-p32
+p31
 sS'model.blocktype'
-p33
+p32
 S'string'
-p34
+p33
 sS'model.dep_ut'
-p35
-g26
+p34
+g25
 sS'exprs'
-p36
-g7
+p35
+g6
 sS'gr_i'
-p37
+p36
 g2
 sS'PREVAR_scicos_context'
-p38
+p37
 NsS'y'
-p39
+p38
 g2
 sS'x'
+p39
+g2
+sS'model'
 p40
-NsS'model'
-p41
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle
index 17ea79f9..0a636074 100644
--- a/js/Linear/DLR_f.pickle
+++ b/js/Linear/DLR_f.pickle
@@ -19,103 +19,101 @@ S'model.dstate'
 p1
 S'vector'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'rpar'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'x.model'
-p8
+p7
 g4
 sS'model.out'
-p9
+p8
 S'double'
-p10
+p9
 sS'x0[ns1-1][1-1]'
-p11
-g10
+p10
+g9
 sS'x.model.firing'
-p12
+p11
 g2
 sS'x.graphics'
-p13
+p12
 g4
 sS'model.evtin'
-p14
-g10
+p13
+g9
 sS'ns'
-p15
-g10
+p14
+g9
 sS'A'
-p16
-g10
+p15
+g9
 sS'model.sim'
-p17
+p16
 S'string'
-p18
+p17
 sS'C'
-p19
-g10
+p18
+g9
 sS'B'
-p20
-g10
+p19
+g9
 sS'D'
-p21
-g10
+p20
+g9
 sS'H'
-p22
-g10
+p21
+g9
 sS'PREVAR_scicos_context.z'
-p23
-g10
+p22
+g9
 sS'model.rpar'
-p24
-g7
+p23
+g6
 sS'mmm'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'model.in'
-p27
-g10
+p26
+g9
 sS'graphics.exprs'
-p28
+p27
 NsS'x0'
-p29
-g10
+p28
+g9
 sS'typ'
-p30
+p29
 g2
 sS'ok'
-p31
+p30
 S'boolean'
-p32
+p31
 sS'model.blocktype'
-p33
-g18
+p32
+g17
 sS'model.dep_ut'
-p34
-g26
+p33
+g25
 sS'exprs'
-p35
-g7
+p34
+g6
 sS'gr_i'
-p36
+p35
 g2
 sS'PREVAR_scicos_context'
-p37
+p36
 NsS'y'
-p38
+p37
 g2
 sS'x'
+p38
+g2
+sS'model'
 p39
-NsS'model'
-p40
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle
index f7d148b7..90bebe05 100644
--- a/js/Linear/DLSS.pickle
+++ b/js/Linear/DLSS.pickle
@@ -25,94 +25,92 @@ S'model.dstate'
 p1
 S'vector'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'rpar'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'x.model'
-p8
+p7
 g4
 sS'model.out'
-p9
+p8
 S'double'
-p10
+p9
 sS'out'
-p11
+p10
 g2
 sS'x.graphics'
-p12
+p11
 g4
 sS'model.evtin'
-p13
-g10
+p12
+g9
 sS'A'
-p14
-g10
+p13
+g9
 sS'model.sim'
-p15
+p14
 S'list'
-p16
+p15
 sS'C'
-p17
-g10
+p16
+g9
 sS'B'
-p18
-g10
+p17
+g9
 sS'D'
-p19
-g10
+p18
+g9
 sS'in1'
-p20
+p19
 g2
 sS'model.rpar'
-p21
-g7
+p20
+g6
 sS'mmm'
-p22
+p21
 S'vector_boolean'
-p23
+p22
 sS'model.in'
-p24
-g10
+p23
+g9
 sS'graphics.exprs'
-p25
-g10
+p24
+g9
 sS'x0'
-p26
-g10
+p25
+g9
 sS'typ'
-p27
+p26
 g2
 sS'model.blocktype'
-p28
+p27
 S'string'
-p29
+p28
 sS'model.dep_ut'
-p30
-g23
+p29
+g22
 sS'exprs'
-p31
-g7
+p30
+g6
 sS'gr_i'
-p32
+p31
 g2
 sS'okD'
-p33
+p32
 S'boolean'
-p34
+p33
 sS'y'
-p35
+p34
 g2
 sS'x'
+p35
+g2
+sS'model'
 p36
-NsS'model'
-p37
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle
index 34b37f6f..374c04c4 100644
--- a/js/Linear/DLSS_f.pickle
+++ b/js/Linear/DLSS_f.pickle
@@ -25,90 +25,88 @@ S'model.dstate'
 p1
 S'vector'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'rpar'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'x.model'
-p8
+p7
 g4
 sS'model.out'
-p9
+p8
 S'double'
-p10
+p9
 sS'out'
-p11
+p10
 g2
 sS'x.graphics'
-p12
+p11
 g4
 sS'model.evtin'
-p13
-g10
+p12
+g9
 sS'A'
-p14
-g10
+p13
+g9
 sS'model.sim'
-p15
+p14
 S'list'
-p16
+p15
 sS'C'
-p17
-g10
+p16
+g9
 sS'B'
-p18
-g10
+p17
+g9
 sS'D'
-p19
-g10
+p18
+g9
 sS'in1'
-p20
+p19
 g2
 sS'model.rpar'
-p21
-g7
+p20
+g6
 sS'mmm'
-p22
+p21
 S'vector_boolean'
-p23
+p22
 sS'model.in'
-p24
-g10
+p23
+g9
 sS'graphics.exprs'
-p25
-g10
+p24
+g9
 sS'x0'
-p26
-g10
+p25
+g9
 sS'typ'
-p27
+p26
 g2
 sS'model.blocktype'
-p28
+p27
 S'string'
-p29
+p28
 sS'model.dep_ut'
-p30
-g23
+p29
+g22
 sS'exprs'
-p31
-g7
+p30
+g6
 sS'gr_i'
-p32
+p31
 g2
 sS'y'
-p33
+p32
 g2
 sS'x'
+p33
+g2
+sS'model'
 p34
-NsS'model'
-p35
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle
index f6e20a69..43aeb8b8 100644
--- a/js/Linear/DOLLAR.pickle
+++ b/js/Linear/DOLLAR.pickle
@@ -23,81 +23,79 @@ sS'model.dstate'
 p3
 S'double'
 p4
-sS'arg1'
+sS'graphics'
 p5
 S'object'
 p6
-sS'graphics'
-p7
-g6
 sS'it'
-p8
+p7
 g4
 sS'x.model'
-p9
+p8
 NsS'inh'
-p10
+p9
 g4
 sS'model.out'
-p11
+p10
 g4
 sS'out'
-p12
+p11
 S'vector'
-p13
+p12
 sS'x.graphics'
-p14
+p13
 g6
 sS'model.evtin'
-p15
+p14
 g4
 sS'exprs[2-1]'
-p16
+p15
 S'string'
-p17
+p16
 sS'model.sim'
-p18
+p17
 g2
 sS'in1'
-p19
+p18
 g4
 sS'model.in'
-p20
+p19
 g4
 sS'graphics.exprs'
-p21
+p20
 NsS'typ'
-p22
-g13
+p21
+g12
 sS'ot'
-p23
+p22
 g4
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
-g17
+p25
+g16
 sS'model.dep_ut'
-p27
+p26
 S'vector_boolean'
-p28
+p27
 sS'exprs'
-p29
-g17
+p28
+g16
 sS'gr_i'
-p30
-g13
+p29
+g12
 sS'y'
-p31
-g13
+p30
+g12
 sS'x'
+p31
+g12
+sS'model'
 p32
-NsS'model'
-p33
 g6
 sS'z'
-p34
+p33
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle
index e9c6d0a6..a8d84e31 100644
--- a/js/Linear/DOLLAR_f.pickle
+++ b/js/Linear/DOLLAR_f.pickle
@@ -19,71 +19,69 @@ S'model.dstate'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'x.model'
-p6
+p5
 NsS'inh'
-p7
+p6
 g2
 sS'model.out'
-p8
+p7
 g2
 sS'out'
-p9
+p8
 S'vector'
-p10
+p9
 sS'x.graphics'
-p11
+p10
 g4
 sS'model.evtin'
-p12
+p11
 g2
 sS'exprs[2-1]'
-p13
+p12
 S'string'
-p14
+p13
 sS'model.sim'
-p15
-g14
+p14
+g13
 sS'in1'
-p16
+p15
 g2
 sS'model.in'
-p17
+p16
 g2
 sS'graphics.exprs'
-p18
+p17
 NsS'typ'
-p19
-g10
+p18
+g9
 sS'model.blocktype'
-p20
-g14
+p19
+g13
 sS'model.dep_ut'
-p21
+p20
 S'vector_boolean'
-p22
+p21
 sS'exprs'
-p23
-g14
+p22
+g13
 sS'gr_i'
-p24
-g10
+p23
+g9
 sS'y'
-p25
-g10
+p24
+g9
 sS'x'
+p25
+g9
+sS'model'
 p26
-NsS'model'
-p27
 g4
 sS'z'
-p28
+p27
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle
index f6e20a69..43aeb8b8 100644
--- a/js/Linear/DOLLAR_m.pickle
+++ b/js/Linear/DOLLAR_m.pickle
@@ -23,81 +23,79 @@ sS'model.dstate'
 p3
 S'double'
 p4
-sS'arg1'
+sS'graphics'
 p5
 S'object'
 p6
-sS'graphics'
-p7
-g6
 sS'it'
-p8
+p7
 g4
 sS'x.model'
-p9
+p8
 NsS'inh'
-p10
+p9
 g4
 sS'model.out'
-p11
+p10
 g4
 sS'out'
-p12
+p11
 S'vector'
-p13
+p12
 sS'x.graphics'
-p14
+p13
 g6
 sS'model.evtin'
-p15
+p14
 g4
 sS'exprs[2-1]'
-p16
+p15
 S'string'
-p17
+p16
 sS'model.sim'
-p18
+p17
 g2
 sS'in1'
-p19
+p18
 g4
 sS'model.in'
-p20
+p19
 g4
 sS'graphics.exprs'
-p21
+p20
 NsS'typ'
-p22
-g13
+p21
+g12
 sS'ot'
-p23
+p22
 g4
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
-g17
+p25
+g16
 sS'model.dep_ut'
-p27
+p26
 S'vector_boolean'
-p28
+p27
 sS'exprs'
-p29
-g17
+p28
+g16
 sS'gr_i'
-p30
-g13
+p29
+g12
 sS'y'
-p31
-g13
+p30
+g12
 sS'x'
+p31
+g12
+sS'model'
 p32
-NsS'model'
-p33
 g6
 sS'z'
-p34
+p33
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle
index bd892ea0..a11ad334 100644
--- a/js/Linear/GAINBLK.pickle
+++ b/js/Linear/GAINBLK.pickle
@@ -15,94 +15,92 @@ p6
 atp7
 Rp8
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'it'
-p4
+p3
 S'double'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'model.out'
-p7
-g5
+p6
+g4
 sS'out'
-p8
-g5
+p7
+g4
 sS'model.in2'
-p9
-g5
+p8
+g4
 sS'x.graphics'
-p10
+p9
 g2
 sS'model.sim'
-p11
+p10
 S'list'
-p12
+p11
 sS'model.out2'
-p13
-g5
+p12
+g4
 sS'in1'
-p14
-g5
+p13
+g4
 sS'in2'
-p15
-g5
+p14
+g4
 sS'model.rpar'
-p16
-g5
+p15
+g4
 sS'model.in'
-p17
-g5
+p16
+g4
 sS'graphics.exprs'
-p18
+p17
 S'matrix'
-p19
+p18
 sS'typ'
-p20
+p19
 S'vector'
-p21
+p20
 sS'model.opar'
-p22
-g12
+p21
+g11
 sS'out2'
-p23
-g5
+p22
+g4
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
+p25
 S'string'
-p27
+p26
 sS'model.dep_ut'
-p28
+p27
 S'vector_boolean'
-p29
+p28
 sS'exprs'
-p30
-g21
+p29
+g20
 sS'gr_i'
-p31
-g21
+p30
+g20
 sS'y'
-p32
-g21
+p31
+g20
 sS'x'
+p32
+g20
+sS'model'
 p33
-NsS'model'
-p34
 g2
 sS'ot'
-p35
-g5
+p34
+g4
 sS'gain'
-p36
-g5
+p35
+g4
 s.
\ No newline at end of file
diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle
index 2244e195..1ff9d8be 100644
--- a/js/Linear/GAINBLK_f.pickle
+++ b/js/Linear/GAINBLK_f.pickle
@@ -32,47 +32,45 @@ sS'model.dep_ut'
 p8
 S'vector_boolean'
 p9
-sS'arg1'
+sS'graphics'
 p10
 g7
-sS'graphics.exprs'
+sS'in1'
 p11
-NsS'in1'
-p12
 g4
 sS'model.rpar'
-p13
+p12
 g4
 sS'exprs'
-p14
+p13
 S'vector'
-p15
+p14
 sS'x.model'
-p16
+p15
 NsS'gr_i'
-p17
-g15
+p16
+g14
 sS'gain'
-p18
+p17
 g4
 sS'model.in'
-p19
+p18
 g4
-sS'graphics'
+sS'graphics.exprs'
+p19
+NsS'y'
 p20
-g7
-sS'y'
-p21
-g15
+g14
 sS'x'
+p21
+g14
+sS'model'
 p22
-NsS'model'
-p23
 g7
 sS'typ'
-p24
-g15
+p23
+g14
 sS'out'
-p25
+p24
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle
index eba9f529..51199eeb 100644
--- a/js/Linear/GAIN_f.pickle
+++ b/js/Linear/GAIN_f.pickle
@@ -32,48 +32,46 @@ sS'model.dep_ut'
 p8
 S'vector_boolean'
 p9
-sS'arg1'
+sS'graphics'
 p10
 g7
-sS'graphics.exprs'
+sS'in1'
 p11
-NsS'in1'
-p12
 g4
 sS'model.rpar'
-p13
+p12
 g4
 sS'exprs'
-p14
+p13
 S'matrix'
-p15
+p14
 sS'x.model'
-p16
+p15
 NsS'gr_i'
-p17
+p16
 S'vector'
-p18
+p17
 sS'gain'
-p19
+p18
 g4
 sS'model.in'
-p20
+p19
 g4
-sS'graphics'
+sS'graphics.exprs'
+p20
+NsS'y'
 p21
-g7
-sS'y'
-p22
-g18
+g17
 sS'x'
+p22
+g17
+sS'model'
 p23
-NsS'model'
-p24
 g7
 sS'typ'
-p25
-g18
+p24
+g17
 sS'out'
-p26
+p25
 g4
 s.
\ No newline at end of file
diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle
index d583d7d8..762ceb23 100644
--- a/js/Linear/INTEGRAL.pickle
+++ b/js/Linear/INTEGRAL.pickle
@@ -25,91 +25,89 @@ S'model.in'
 p1
 S'double'
 p2
-sS'arg1'
-p3
-S'object'
-p4
 sS'reinit'
-p5
+p3
 g2
 sS'rpar'
-p6
+p4
 S'vector'
-p7
+p5
 sS'model.out'
-p8
+p6
 g2
 sS'x.model'
-p9
+p7
 NsS'minp'
-p10
+p8
 g2
 sS'graphics'
-p11
-g4
+p9
+S'object'
+p10
 sS'x.graphics'
-p12
-g4
+p11
+g10
 sS'typ'
-p13
-g7
+p12
+g5
 sS'maxp'
-p14
+p13
 g2
 sS'model.sim'
-p15
+p14
 S'list'
-p16
+p15
 sS'model.nmode'
-p17
+p16
 g2
 sS'model.rpar'
-p18
-g7
+p17
+g5
 sS'satur'
-p19
+p18
 g2
 sS'model.state'
-p20
+p19
 g2
 sS'lowp'
-p21
+p20
 S'string'
-p22
+p21
 sS'graphics.exprs'
-p23
+p22
 NsS'x0'
-p24
-g7
+p23
+g5
 sS'model.nzcross'
-p25
+p24
 g2
 sS'x.graphics.id'
-p26
-g22
+p25
+g21
 sS'ok'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'model.blocktype'
-p29
-g22
+p28
+g21
 sS'model.dep_ut'
-p30
+p29
 S'vector_boolean'
-p31
+p30
 sS'exprs'
-p32
-g22
+p31
+g21
 sS'gr_i'
-p33
-g7
+p32
+g5
 sS'y'
-p34
-g7
+p33
+g5
 sS'x'
+p34
+g5
+sS'model'
 p35
-NsS'model'
-p36
-g4
+g10
 s.
\ No newline at end of file
diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle
index 1ca01f73..a884ed6d 100644
--- a/js/Linear/INTEGRAL_f.pickle
+++ b/js/Linear/INTEGRAL_f.pickle
@@ -32,44 +32,42 @@ sS'x.graphics'
 p8
 S'object'
 p9
-sS'arg1'
+sS'graphics'
 p10
 g9
-sS'graphics.exprs'
+sS'model.dep_ut'
 p11
-NsS'model.dep_ut'
-p12
 S'vector_boolean'
-p13
+p12
 sS'exprs'
-p14
+p13
 g4
 sS'x.model'
-p15
+p14
 NsS'gr_i'
-p16
+p15
 g7
 sS'model.state'
-p17
+p16
 g4
 sS'model.in'
-p18
+p17
 g4
-sS'graphics'
+sS'graphics.exprs'
+p18
+NsS'y'
 p19
-g9
-sS'y'
-p20
 g7
 sS'x'
-p21
-NsS'model'
-p22
-g9
-sS'typ'
-p23
+p20
 g7
 sS'x0'
-p24
+p21
 g4
+sS'typ'
+p22
+g7
+sS'model'
+p23
+g9
 s.
\ No newline at end of file
diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle
index 2671c665..19fe7607 100644
--- a/js/Linear/INTEGRAL_m.pickle
+++ b/js/Linear/INTEGRAL_m.pickle
@@ -25,41 +25,41 @@ S'model.in'
 p1
 S'double'
 p2
-sS'arg1'
-p3
-S'object'
-p4
 sS'reinit'
-p5
+p3
 g2
 sS'it'
-p6
+p4
 S'matrix'
-p7
+p5
 sS'rpar'
-p8
+p6
 S'vector'
-p9
+p7
 sS'model.out'
-p10
+p8
 g2
 sS'x.model'
-p11
+p9
 NsS'minp'
-p12
+p10
 g2
 sS'out'
-p13
+p11
 g2
 sS'model.in2'
-p14
+p12
 g2
+sS'graphics'
+p13
+S'object'
+p14
 sS'x.graphics'
 p15
-g4
+g14
 sS'typ'
 p16
-g9
+g7
 sS'maxp'
 p17
 g2
@@ -79,7 +79,7 @@ S'vector_string'
 p23
 sS'model.rpar'
 p24
-g9
+g7
 sS'model.nmode'
 p25
 g2
@@ -92,10 +92,9 @@ g2
 sS'lowp'
 p28
 g2
-sS'graphics'
+sS'graphics.exprs'
 p29
-g4
-sS'model.nzcross'
+NsS'model.nzcross'
 p30
 g2
 sS'ok'
@@ -115,18 +114,17 @@ p37
 g34
 sS'gr_i'
 p38
-g9
-sS'graphics.exprs'
+g7
+sS'y'
 p39
-NsS'y'
-p40
-g9
+g7
 sS'x'
+p40
+g7
+sS'model'
 p41
-NsS'model'
-p42
-g4
+g14
 sS'ot'
-p43
+p42
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index 3eccc084..8759a559 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -44,7 +44,11 @@ function PID() {
     }
     PID.prototype.get = function PID() {
         var ppath = list(0,0,0);
+        for (this.i=1;this.i<=length(this.model.rpar.objs);this.i+=1) {
+            var o = this.model.rpar.objs[this.i-1];
             if (typeof(o)=="Link") {
+                var from = this.model.rpar.objs[o.from[1-1]-1];
+                var to = this.model.rpar.objs[o.to[1-1]-1];
                 if (from.gui=="GAINBLK") {
                     switch (to.gui) {
                     case "SUMMATION":
@@ -70,10 +74,13 @@ function PID() {
             }
         }
         var newpar = list();
+        var xx1 = this.model.rpar.objs[ppath[1-1]-1];
         exprs[1-1] = xx1.graphics.exprs[1-1];
         var p_old = xx1.model.rpar;
+        var xx2 = this.model.rpar.objs[ppath[2-1]-1];
         exprs[2-1] = xx2.graphics.exprs[1-1];
         var i_old = xx2.model.rpar;
+        var xx3 = this.model.rpar.objs[ppath[3-1]-1];
         exprs[3-1] = xx3.graphics.exprs[1-1];
         var d_old = xx3.model.rpar;
         var y = 0;
@@ -87,7 +94,11 @@ function PID() {
     }
     PID.prototype.set = function PID() {
         var ppath = list(0,0,0);
+        for (this.i=1;this.i<=length(this.model.rpar.objs);this.i+=1) {
+            var o = this.model.rpar.objs[this.i-1];
             if (typeof(o)=="Link") {
+                var from = this.model.rpar.objs[o.from[1-1]-1];
+                var to = this.model.rpar.objs[o.to[1-1]-1];
                 if (from.gui=="GAINBLK") {
                     switch (to.gui) {
                     case "SUMMATION":
@@ -113,10 +124,13 @@ function PID() {
             }
         }
         var newpar = list();
+        var xx1 = this.model.rpar.objs[ppath[1-1]-1];
         exprs[1-1] = xx1.graphics.exprs[1-1];
         var p_old = xx1.model.rpar;
+        var xx2 = this.model.rpar.objs[ppath[2-1]-1];
         exprs[2-1] = xx2.graphics.exprs[1-1];
         var i_old = xx2.model.rpar;
+        var xx3 = this.model.rpar.objs[ppath[3-1]-1];
         exprs[3-1] = xx3.graphics.exprs[1-1];
         var d_old = xx3.model.rpar;
         var y = 0;
@@ -136,6 +150,9 @@ function PID() {
                 xx2.model.rpar = this.i;
                 xx3.graphics.exprs = exprs0[3-1];
                 xx3.model.rpar = this.d;
+                this.model.rpar.objs[ppath[1-1]-1] = xx1;
+                this.model.rpar.objs[ppath[2-1]-1] = xx2;
+                this.model.rpar.objs[ppath[3-1]-1] = xx3;
                 break;
             }
         }
diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle
index 1a7360b6..fad84fa4 100644
--- a/js/Linear/PID.pickle
+++ b/js/Linear/PID.pickle
@@ -41,206 +41,197 @@ sS'ppath'
 p9
 S'list'
 p10
-sS'arg1'
-p11
-g2
 sS'xx2.model.rpar'
-p12
+p11
 NsS'xx1.graphics.exprs'
-p13
+p12
 g4
-sS'model.rpar'
+sS'o'
+p13
+g2
+sS'scs_m'
 p14
 g4
-sS'xx2.model'
-p15
-g2
-sS'gr_i'
-p16
-S'vector'
-p17
 sS'model.out2'
-p18
+p15
 g4
 sS'model.out'
-p19
+p16
 g4
 sS'scs_m.objs[20-1]'
-p20
+p17
 g4
 sS'ppath[3-1]'
-p21
+p18
 g4
 sS'xx1.model.rpar'
-p22
+p19
 NsS'scs_m.objs[10-1]'
-p23
+p20
 g4
 sS'xx3.model.rpar'
-p24
+p21
 NsS'model.intyp'
-p25
+p22
 g4
 sS'scs_m.objs[19-1]'
-p26
+p23
 g4
 sS'from'
-p27
+p24
 g2
 sS'xx2.graphics.exprs'
-p28
+p25
 g4
 sS'scs_m.objs[18-1]'
-p29
+p26
 g4
 sS'scs_m.objs[2-1]'
-p30
+p27
 g4
 sS'xx1.graphics'
-p31
-g2
-sS'arg1.model.rpar.objs[ppath[2-1]-1]'
-p32
+p28
 g2
 sS'model.dep_ut'
-p33
+p29
 S'vector_boolean'
-p34
+p30
 sS'scs_m.objs[5-1]'
-p35
+p31
 g4
 sS'newpar[size(newpar)+1-1]'
-p36
+p32
 g4
 sS'to'
-p37
+p33
 g2
 sS'ppath[2-1]'
-p38
+p34
 g4
+sS'model.rpar.objs[ppath[1-1]-1]'
+p35
+g2
 sS'exprs[2-1]'
-p39
+p36
 g4
 sS'scs_m.objs[12-1]'
-p40
+p37
 g4
 sS'scs_m.objs[13-1]'
-p41
+p38
 g4
 sS'd_old'
-p42
+p39
 NsS'newpar'
-p43
+p40
 g10
 sS'model.in2'
-p44
+p41
 g4
 sS'scs_m.objs[6-1]'
-p45
+p42
 g4
 sS'scs_m.objs[9-1]'
-p46
+p43
 g4
 sS'xx2.graphics'
-p47
+p44
 g2
-sS'i_old'
-p48
-NsS'scs_m.objs[3-1]'
-p49
+sS'model.rpar'
+p45
+g4
+sS'scs_m.objs[3-1]'
+p46
+g4
+sS'model.outtyp'
+p47
 g4
-sS'arg1.model.rpar.objs[ppath[3-1]-1]'
-p50
-g2
 sS'ppath[1-1]'
-p51
+p48
 g4
 sS'exprs[3-1]'
-p52
+p49
 g4
 sS'scs_m.objs[14-1]'
-p53
-g4
-sS'scs_m.objs[17-1]'
-p54
+p50
 g4
-sS'model.in'
-p55
+sS'i_old'
+p51
+NsS'model.in'
+p52
 g4
 sS'scs_m.objs[4-1]'
-p56
+p53
 g4
 sS'scs_m.objs[7-1]'
-p57
+p54
 g4
 sS'typ'
-p58
+p55
 g10
-sS'model.outtyp'
-p59
-g4
 sS'p_old'
-p60
+p56
 NsS'needcompile'
-p61
-g4
-sS'scs_m'
-p62
+p57
 g4
-sS'arg1.model'
-p63
+sS'model.rpar.objs[ppath[3-1]-1]'
+p58
 g2
 sS'xx3.graphics'
-p64
+p59
 g2
 sS'model.blocktype'
-p65
+p60
 S'string'
-p66
+p61
 sS'scs_m.objs[8-1]'
-p67
+p62
 g4
 sS'xx3.model'
-p68
+p63
 g2
 sS'scs_m.objs[21-1]'
-p69
+p64
 g4
 sS'scs_m.objs[15-1]'
-p70
+p65
 g4
+sS'model.rpar.objs[ppath[2-1]-1]'
+p66
+g2
 sS'scs_m.objs[16-1]'
-p71
+p67
 g4
-sS'o'
-p72
+sS'xx2.model'
+p68
 g2
 sS'scs_m.objs[1-1]'
-p73
+p69
 g4
 sS'model.sim'
-p74
-g66
+p70
+g61
 sS'scs_m.objs[11-1]'
-p75
+p71
 g4
 sS'model.firing'
-p76
+p72
 S'boolean'
-p77
-sS'arg1.model.rpar.objs[ppath[1-1]-1]'
-p78
-g2
+p73
 sS'y'
-p79
+p74
 g4
 sS'x'
-p80
-g2
+p75
+S'vector'
+p76
 sS'model'
-p81
-g2
-sS'arg1.model.rpar'
-p82
+p77
 g2
+sS'gr_i'
+p78
+g76
+sS'scs_m.objs[17-1]'
+p79
+g4
 s.
\ No newline at end of file
diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle
index 701b1ab0..93042c09 100644
--- a/js/Linear/REGISTER.pickle
+++ b/js/Linear/REGISTER.pickle
@@ -19,72 +19,70 @@ S'model.odstate'
 p1
 S'list'
 p2
-sS'model.dstate'
+sS'model.sim'
 p3
-S'double'
+g2
+sS'model.out'
 p4
-sS'arg1'
+S'double'
 p5
-S'object'
+sS'ok'
 p6
-sS'graphics'
+S'boolean'
 p7
-g6
-sS'x.model'
+sS'model.evtin'
 p8
-NsS'model.out'
-p9
-g4
+g5
 sS'x.graphics'
+p9
+S'object'
 p10
-g6
-sS'typ'
+sS'z0'
 p11
-S'vector'
+g5
+sS'graphics.exprs'
 p12
-sS'model.evtin'
+S'matrix'
 p13
-g4
-sS'model.sim'
-p14
-g2
 sS'in1'
+p14
+S'vector'
 p15
-g12
-sS'model.in'
+sS'model.dstate'
 p16
-g4
-sS'graphics.exprs'
+g5
+sS'exprs'
 p17
-S'matrix'
+g5
+sS'x.model'
 p18
-sS'z0'
+NsS'gr_i'
 p19
-g4
-sS'ok'
+g15
+sS'model.dep_ut'
 p20
-S'boolean'
+S'vector_boolean'
 p21
-sS'model.blocktype'
+sS'model.in'
 p22
-S'string'
+g5
+sS'graphics'
 p23
-sS'model.dep_ut'
+g10
+sS'y'
 p24
-S'vector_boolean'
+g15
+sS'x'
 p25
-sS'exprs'
+g15
+sS'model'
 p26
-g4
-sS'gr_i'
+g10
+sS'typ'
 p27
-g12
-sS'y'
+g15
+sS'model.blocktype'
 p28
-g12
-sS'x'
+S'string'
 p29
-NsS'model'
-p30
-g6
 s.
\ No newline at end of file
diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle
index 3f4e04af..1e0d1807 100644
--- a/js/Linear/REGISTER_f.pickle
+++ b/js/Linear/REGISTER_f.pickle
@@ -32,9 +32,9 @@ sS'x.graphics'
 p8
 S'object'
 p9
-sS'arg1'
+sS'z0'
 p10
-g9
+g4
 sS'graphics.exprs'
 p11
 NsS'model.dstate'
@@ -49,31 +49,29 @@ NsS'gr_i'
 p15
 S'vector'
 p16
-sS'z0'
-p17
-g4
 sS'model.dep_ut'
-p18
+p17
 S'vector_boolean'
-p19
+p18
 sS'model.in'
-p20
+p19
 g4
 sS'graphics'
-p21
+p20
 g9
 sS'y'
-p22
+p21
 g16
 sS'x'
+p22
+g16
+sS'model'
 p23
-NsS'model'
-p24
 g9
 sS'typ'
-p25
+p24
 g16
 sS'model.blocktype'
-p26
+p25
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle
index d49bc1ed..38caaf74 100644
--- a/js/Linear/SAMPHOLD.pickle
+++ b/js/Linear/SAMPHOLD.pickle
@@ -48,7 +48,8 @@ p15
 g6
 sS'x'
 p16
-NsS'model'
+g6
+sS'model'
 p17
 S'object'
 p18
diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle
index 4124cfbf..4192e544 100644
--- a/js/Linear/SAMPHOLD_m.pickle
+++ b/js/Linear/SAMPHOLD_m.pickle
@@ -13,83 +13,74 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'model.sim'
 p1
-S'object'
+S'list'
 p2
-sS'graphics'
+sS'model.intyp'
 p3
-g2
-sS'model.out'
-p4
 S'double'
+p4
+sS'model.out2'
 p5
-sS'model.in2'
+g4
+sS'ok'
 p6
-g5
-sS'model.intyp'
+S'boolean'
 p7
-g5
-sS'x.model.firing'
+sS'model.evtin'
 p8
-S'vector'
+g4
+sS'x.model.firing'
 p9
-sS'label'
+S'vector'
 p10
-S'vector_string'
+sS'model.in2'
 p11
-sS'model.evtin'
+g4
+sS'graphics.exprs'
 p12
-g5
-sS'model.sim'
+NsS'in1'
 p13
-S'list'
+g10
+sS'model.out'
 p14
-sS'arg1.graphics'
+g4
+sS'label'
 p15
-g2
-sS'model.out2'
+S'vector_string'
 p16
-g5
-sS'in1'
-p17
-g9
 sS'model.outtyp'
+p17
+g4
+sS'gr_i'
 p18
-g5
-sS'model.in'
+g10
+sS'model.dep_ut'
 p19
-g5
-sS'graphics.exprs'
+S'vector_boolean'
 p20
-NsS'typ'
+sS'model.in'
 p21
-g9
-sS'arg1.model'
+g4
+sS'graphics'
 p22
-g2
-sS'ok'
+S'object'
 p23
-S'boolean'
+sS'y'
 p24
-sS'model.blocktype'
+g10
+sS'x'
 p25
-S'string'
+g10
+sS'model'
 p26
-sS'model.dep_ut'
+g23
+sS'typ'
 p27
-S'vector_boolean'
+g10
+sS'model.blocktype'
 p28
-sS'gr_i'
+S'string'
 p29
-g9
-sS'y'
-p30
-g9
-sS'x'
-p31
-g2
-sS'model'
-p32
-g2
 s.
\ No newline at end of file
diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle
index e425e3bb..a740d69d 100644
--- a/js/Linear/SAMPLEHOLD_f.pickle
+++ b/js/Linear/SAMPLEHOLD_f.pickle
@@ -47,7 +47,8 @@ p14
 g5
 sS'x'
 p15
-NsS'model'
+g5
+sS'model'
 p16
 S'object'
 p17
diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle
index 4274b750..c3ee5f4f 100644
--- a/js/Linear/SOM_f.pickle
+++ b/js/Linear/SOM_f.pickle
@@ -23,53 +23,51 @@ sS'model.in'
 p5
 S'matrix'
 p6
-sS'exprs'
+sS'p'
 p7
-g6
-sS'arg1'
-p8
-S'object'
-p9
+g4
 sS'sgn'
-p10
+p8
 g6
 sS'model.rpar'
-p11
+p9
 g6
 sS'labs'
-p12
+p10
 S'vector_string'
-p13
-sS'p'
-p14
-g4
+p11
+sS'exprs'
+p12
+g6
 sS'gr_i'
-p15
+p13
 S'vector'
-p16
+p14
 sS'model.dep_ut'
-p17
+p15
 S'vector_boolean'
-p18
+p16
 sS'str'
-p19
+p17
 g6
 sS'graphics'
-p20
-g9
+p18
+S'object'
+p19
 sS'y'
-p21
-g16
+p20
+g14
 sS'x'
+p21
+g14
+sS'model'
 p22
-NsS'model'
-p23
-g9
+g19
 sS'typ'
-p24
-g16
+p23
+g14
 sS'model.blocktype'
-p25
+p24
 S'string'
-p26
+p25
 s.
\ No newline at end of file
diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle
index 39d2bb39..bd664544 100644
--- a/js/Linear/SUMMATION.pickle
+++ b/js/Linear/SUMMATION.pickle
@@ -17,92 +17,90 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'it'
-p4
+p3
 S'string'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'sgn'
-p7
+p6
 S'matrix'
-p8
+p7
 sS'model.out'
-p9
+p8
 S'double'
-p10
+p9
 sS'model.in2'
-p11
-g8
+p10
+g7
 sS'x.graphics'
-p12
+p11
 g2
 sS'model.sim'
-p13
+p12
 S'list'
-p14
+p13
 sS'model.out2'
-p15
-g10
+p14
+g9
 sS'in1'
-p16
-g10
+p15
+g9
 sS'in2'
-p17
-g10
+p16
+g9
 sS'model.rpar'
-p18
+p17
 NsS'model.in'
-p19
-g8
+p18
+g7
 sS'graphics.exprs'
-p20
-g8
+p19
+g7
 sS'nout2'
-p21
-g10
+p20
+g9
 sS'model.ipar'
-p22
-g8
+p21
+g7
 sS'typ'
-p23
+p22
 S'vector'
-p24
+p23
 sS'ok'
-p25
+p24
 S'boolean'
-p26
+p25
 sS'model.blocktype'
-p27
-g5
+p26
+g4
 sS'model.dep_ut'
-p28
+p27
 S'vector_boolean'
-p29
+p28
 sS'exprs'
-p30
-g5
+p29
+g4
 sS'gr_i'
-p31
-g24
+p30
+g23
 sS'y'
-p32
-g24
+p31
+g23
 sS'x'
+p32
+g23
+sS'model'
 p33
-NsS'model'
-p34
 g2
 sS'ot'
-p35
+p34
 NsS'nout'
-p36
-g10
+p35
+g9
 s.
\ No newline at end of file
diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle
index 2d3d0ddc..8da353f0 100644
--- a/js/Linear/SUM_f.pickle
+++ b/js/Linear/SUM_f.pickle
@@ -46,7 +46,8 @@ p15
 g8
 sS'x'
 p16
-NsS'model'
+g8
+sS'model'
 p17
 S'object'
 p18
diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle
index b0c5bc53..6d41b1bc 100644
--- a/js/Linear/TCLSS.pickle
+++ b/js/Linear/TCLSS.pickle
@@ -21,97 +21,95 @@ p9
 atp10
 Rp11
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
-g8
+p8
+g7
 sS'x.graphics'
-p10
+p9
 g2
 sS'nx'
-p11
-g8
+p10
+g7
 sS'model.evtin'
-p12
-g8
+p11
+g7
 sS'A'
-p13
-g8
+p12
+g7
 sS'model.sim'
-p14
+p13
 S'list'
-p15
+p14
 sS'C'
-p16
-g8
+p15
+g7
 sS'B'
-p17
-g8
+p16
+g7
 sS'D'
-p18
-g8
+p17
+g7
 sS'in1'
-p19
-g8
+p18
+g7
 sS'model.rpar'
-p20
-g5
+p19
+g4
 sS'mmm'
-p21
+p20
 S'vector_boolean'
-p22
+p21
 sS'model.state'
-p23
-g8
+p22
+g7
 sS'model.in'
-p24
-g5
+p23
+g4
 sS'graphics.exprs'
-p25
-g8
+p24
+g7
 sS'x0'
-p26
-g8
+p25
+g7
 sS'typ'
-p27
+p26
 S'vector'
-p28
+p27
 sS'model.blocktype'
-p29
+p28
 S'string'
-p30
+p29
 sS'model.dep_ut'
-p31
-g22
+p30
+g21
 sS'exprs'
-p32
-g5
+p31
+g4
 sS'gr_i'
-p33
-g28
+p32
+g27
 sS'y'
-p34
-g28
+p33
+g27
 sS'x'
+p34
+g27
+sS'model'
 p35
-NsS'model'
-p36
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle
index b0c5bc53..6d41b1bc 100644
--- a/js/Linear/TCLSS_f.pickle
+++ b/js/Linear/TCLSS_f.pickle
@@ -21,97 +21,95 @@ p9
 atp10
 Rp11
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 g2
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
-g8
+p8
+g7
 sS'x.graphics'
-p10
+p9
 g2
 sS'nx'
-p11
-g8
+p10
+g7
 sS'model.evtin'
-p12
-g8
+p11
+g7
 sS'A'
-p13
-g8
+p12
+g7
 sS'model.sim'
-p14
+p13
 S'list'
-p15
+p14
 sS'C'
-p16
-g8
+p15
+g7
 sS'B'
-p17
-g8
+p16
+g7
 sS'D'
-p18
-g8
+p17
+g7
 sS'in1'
-p19
-g8
+p18
+g7
 sS'model.rpar'
-p20
-g5
+p19
+g4
 sS'mmm'
-p21
+p20
 S'vector_boolean'
-p22
+p21
 sS'model.state'
-p23
-g8
+p22
+g7
 sS'model.in'
-p24
-g5
+p23
+g4
 sS'graphics.exprs'
-p25
-g8
+p24
+g7
 sS'x0'
-p26
-g8
+p25
+g7
 sS'typ'
-p27
+p26
 S'vector'
-p28
+p27
 sS'model.blocktype'
-p29
+p28
 S'string'
-p30
+p29
 sS'model.dep_ut'
-p31
-g22
+p30
+g21
 sS'exprs'
-p32
-g5
+p31
+g4
 sS'gr_i'
-p33
-g28
+p32
+g27
 sS'y'
-p34
-g28
+p33
+g27
 sS'x'
+p34
+g27
+sS'model'
 p35
-NsS'model'
-p36
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle
index 5ab7a862..574ada26 100644
--- a/js/Linear/TIME_DELAY.pickle
+++ b/js/Linear/TIME_DELAY.pickle
@@ -17,79 +17,77 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'double'
-p6
+p5
 sS'x.graphics'
-p7
+p6
 g2
 sS'init'
-p8
-g6
+p7
+g5
 sS'model.sim'
-p9
+p8
 S'list'
-p10
+p9
 sS'nin'
-p11
-g6
+p10
+g5
 sS'model.rpar'
-p12
+p11
 S'vector'
-p13
+p12
 sS'N'
-p14
-g6
+p13
+g5
 sS'T'
-p15
-g6
+p14
+g5
 sS'model.in'
-p16
-g13
+p15
+g12
 sS'graphics.exprs'
-p17
+p16
 NsS'model.ipar'
-p18
-g6
+p17
+g5
 sS'typ'
-p19
-g13
+p18
+g12
 sS'ok'
-p20
+p19
 S'boolean'
-p21
+p20
 sS'model.blocktype'
-p22
+p21
 S'string'
-p23
+p22
 sS'model.dep_ut'
-p24
+p23
 S'vector_boolean'
-p25
+p24
 sS'exprs'
-p26
+p25
 S'matrix'
-p27
+p26
 sS'gr_i'
-p28
-g13
+p27
+g12
 sS'y'
-p29
-g13
+p28
+g12
 sS'x'
+p29
+g12
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle
index cddddfa5..9c456020 100644
--- a/js/Linear/VARIABLE_DELAY.pickle
+++ b/js/Linear/VARIABLE_DELAY.pickle
@@ -17,79 +17,77 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 g2
 sS'model.out'
-p5
+p4
 S'double'
-p6
+p5
 sS'x.graphics'
-p7
+p6
 g2
 sS'init'
-p8
-g6
+p7
+g5
 sS'model.sim'
-p9
+p8
 S'list'
-p10
+p9
 sS'nin'
-p11
-g6
+p10
+g5
 sS'model.rpar'
-p12
+p11
 S'vector'
-p13
+p12
 sS'N'
-p14
-g6
+p13
+g5
 sS'T'
-p15
-g6
+p14
+g5
 sS'model.in'
-p16
+p15
 S'matrix'
-p17
+p16
 sS'graphics.exprs'
-p18
+p17
 NsS'model.ipar'
-p19
-g6
+p18
+g5
 sS'typ'
-p20
-g13
+p19
+g12
 sS'ok'
-p21
+p20
 S'boolean'
-p22
+p21
 sS'model.blocktype'
-p23
+p22
 S'string'
-p24
+p23
 sS'model.dep_ut'
-p25
+p24
 S'vector_boolean'
-p26
+p25
 sS'exprs'
-p27
-g17
+p26
+g16
 sS'gr_i'
-p28
-g13
+p27
+g12
 sS'y'
-p29
-g13
+p28
+g12
 sS'x'
+p29
+g12
+sS'model'
 p30
-NsS'model'
-p31
 g2
 s.
\ No newline at end of file