Index: cpp/tests/evol_test-fH.goal
===================================================================
--- cpp/tests/evol_test-fH.goal	(revision 1069)
+++ cpp/tests/evol_test-fH.goal	(revision 1143)
@@ -17,5 +17,5 @@
 n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
 n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
@@ -37,6 +37,6 @@
 j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
 j:
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
@@ -57,5 +57,5 @@
 j:
 n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
@@ -78,5 +78,5 @@
 j:
 n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
@@ -93,5 +93,5 @@
 n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
 n:0.644235469866544, -0.6203041723929346, 0.261, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
@@ -131,5 +131,5 @@
 n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
 n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.829
+n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
Index: cpp/tests/evol_test-fL.goal
===================================================================
--- cpp/tests/evol_test-fL.goal	(revision 1069)
+++ cpp/tests/evol_test-fL.goal	(revision 1143)
@@ -8,6 +8,6 @@
 Evaluation 70	133,158,178	4,4.2,5	3,3.2,4	2,2.9,4	0,0.8,1	124,146.9,167
 Evaluation 80	136,159.7,173	4,4.4,5	3,3.4,4	2,2.8,3	1,1,1	126,148.1,162
-Evaluation 90	136,163.1,189	4,4.6,5	3,3.6,4	2,2.8,3	1,1,1	126,151.1,178
-Evaluation 99	136,168.3,189	4,4.8,5	3,3.8,4	2,2.9,3	1,1,1	126,155.8,178
+Evaluation 90	136,163,189	4,4.6,5	3,3.6,4	2,2.8,3	1,1,1	126,151,178
+Evaluation 99	136,168.2,189	4,4.8,5	3,3.8,4	2,2.9,3	1,1,1	126,155.7,178
 167.0	//L
 w:w0
@@ -15,8 +15,8 @@
 
 162.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.948)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
 
 167.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.948)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
 
 136.0	//L
@@ -24,5 +24,5 @@
 
 189.0	//L
-i:axiom="N(d=Gpart:rz=-0.665)N(d=@:p=0.948)N(d=@:p=0.975)S()S(fr=0.8289400283247232, stam=0.4012594970408827)S()C(-0.7881847871467471)S(stam=0.5370225172955543)", maxwords=300
+i:axiom="N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232, stam=0.4012594970408827)S()C(-0.7881847871467471)S(stam=0.5370225172955543)", maxwords=300
 
 167.0	//L
@@ -34,7 +34,7 @@
 i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.993)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
 
-167.0	//L
+166.0	//L
 w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.991)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.99)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
 
 189.0	//L
@@ -43,5 +43,5 @@
 
 167.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.948)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
 
 
Index: cpp/tests/f0_variants_test-complex.goal
===================================================================
--- cpp/tests/f0_variants_test-complex.goal	(revision 1069)
+++ cpp/tests/f0_variants_test-complex.goal	(revision 1143)
@@ -8,9 +8,9 @@
 ==== With defdata (skips default values) ======
 m:
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, vg=0.5, vb=0.5
-p:x=1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, vg=0.5, vb=0.5
-p:x=2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, vg=0.5, vb=0.5
-j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0, stam=0.15625, vr=0.5, vg=0.5, vb=0.5
-j:p1=1, p2=2, dx=1.0, dy=0.0, dz=0.0, stam=0.175, vr=0.5, vg=0.5, vb=0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:x=1.0, fr=1.12, ing=0.53125, as=0.15625
+p:x=2.0, fr=0.976, ing=0.475, as=0.175
+j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0, stam=0.15625
+j:p1=1, p2=2, dx=1.0, dy=0.0, dz=0.0, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
Index: cpp/tests/f0_variants_test-default.goal
===================================================================
--- cpp/tests/f0_variants_test-default.goal	(revision 1069)
+++ cpp/tests/f0_variants_test-default.goal	(revision 1143)
@@ -8,7 +8,7 @@
 ==== With defdata (skips default values) ======
 m:
-p:vr=0.5, vg=0.5, vb=0.5
-p:x=1.0, vr=0.5, vg=0.5, vb=0.5
-j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0, vr=0.5, vg=0.5, vb=0.5
+p:
+p:x=1.0
+j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
Index: cpp/tests/f0_variants_test-fS.goal
===================================================================
--- cpp/tests/f0_variants_test-fS.goal	(revision 1069)
+++ cpp/tests/f0_variants_test-fS.goal	(revision 1143)
@@ -41,27 +41,27 @@
 ==== Without defdata (saves all fields) ======
 m:se=1.0, Vstyle=
-p:x=0.0, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=0.806, sz=2.295, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.6610658177212956, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=1.0, sz=0.806, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.669522581015868, y=-0.12927953115999094, z=1.770803754024758, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.5149067817465802, y=-0.12852148117052686, z=1.7757109168238943, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.275, as=0.25, rx=-1.277, ry=-1.087, rz=-0.9208, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=3.491120795397971, y=0.0627093264475479, z=3.542562176271334, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.4085, ry=1.0807, rz=0.5977, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=4.82498021179015, y=-1.4556859677056804, z=3.7057221690326423, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=-0.9279, ry=-0.2806, rz=-0.7292, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.044122892122303, y=0.0, z=0.0, sh=3, s=1.0, sx=1.0144, sy=0.903, sz=0.903, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=0.0, ry=0.271, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.1225041839451873, y=0.3558613626799459, z=1.8896569415253044, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=3.2159989925040344, y=-0.15022914055334208, z=2.057760603467444, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.0846131653683386, y=-0.09317957887309433, z=-3.5838606901740344, sh=2, s=1.0, sx=1.273, sy=0.133, sz=1.509, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=-0.9744, ry=-1.5695, rz=1.1659, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=0.1364642552368182, y=0.619565647570761, z=3.289951226640109, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.6422082610960242, y=-0.21052356609516198, z=2.883642273506047, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=1, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=1, p2=2, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=1, p2=3, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=3, p2=4, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=4, p2=5, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=6, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=6, p2=7, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=6, p2=8, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=9, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=10, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=11, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
+p:x=0.0, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=0.806, sz=2.295, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.6610658177212956, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=1.0, sz=0.806, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.669522581015868, y=-0.12927953115999094, z=1.770803754024758, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.5149067817465802, y=-0.12852148117052686, z=1.7757109168238943, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.275, as=0.25, rx=-1.277, ry=-1.087, rz=-0.9208, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=3.491120795397971, y=0.0627093264475479, z=3.542562176271334, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.4085, ry=1.0807, rz=0.5977, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=4.82498021179015, y=-1.4556859677056804, z=3.7057221690326423, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=-0.9279, ry=-0.2806, rz=-0.7292, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.044122892122303, y=0.0, z=0.0, sh=3, s=1.0, sx=1.0144, sy=0.903, sz=0.903, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=0.0, ry=0.271, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.1225041839451873, y=0.3558613626799459, z=1.8896569415253044, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=3.2159989925040344, y=-0.15022914055334208, z=2.057760603467444, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.0846131653683386, y=-0.09317957887309433, z=-3.5838606901740344, sh=2, s=1.0, sx=1.273, sy=0.133, sz=1.509, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=-0.9744, ry=-1.5695, rz=1.1659, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=0.1364642552368182, y=0.619565647570761, z=3.289951226640109, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.6422082610960242, y=-0.21052356609516198, z=2.883642273506047, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=1, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=2, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=3, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=3, p2=4, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=4, p2=5, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=6, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=6, p2=7, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=6, p2=8, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=9, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=10, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=11, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
 n:p=0, j=-1, d=Gpart, i=, Vstyle=neuro
 n:p=1, j=-1, d=N, i=, Vstyle=neuro
Index: cpp/tests/full_props-fS.goal
===================================================================
--- cpp/tests/full_props-fS.goal	(revision 1069)
+++ cpp/tests/full_props-fS.goal	(revision 1143)
@@ -1,27 +1,27 @@
 //0s
 m:se=1.0, Vstyle=
-p:x=0.0, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=0.806, sz=2.295, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.6610658177212956, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=1.0, sz=0.806, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.669522581015868, y=-0.12927953115999094, z=1.770803754024758, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.5149067817465802, y=-0.12852148117052686, z=1.7757109168238943, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.275, as=0.25, rx=-1.277, ry=-1.087, rz=-0.9208, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=3.491120795397971, y=0.0627093264475479, z=3.542562176271334, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.4085, ry=1.0807, rz=0.5977, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=4.82498021179015, y=-1.4556859677056804, z=3.7057221690326423, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=-0.9279, ry=-0.2806, rz=-0.7292, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.044122892122303, y=0.0, z=0.0, sh=3, s=1.0, sx=1.0144, sy=0.903, sz=0.903, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=0.0, ry=0.271, rz=0.0, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=2.1225041839451873, y=0.3558613626799459, z=1.8896569415253044, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=3.2159989925040344, y=-0.15022914055334208, z=2.057760603467444, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.0846131653683386, y=-0.09317957887309433, z=-3.5838606901740344, sh=2, s=1.0, sx=1.273, sy=0.133, sz=1.509, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=-0.9744, ry=-1.5695, rz=1.1659, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=0.1364642552368182, y=0.619565647570761, z=3.289951226640109, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-p:x=1.6422082610960242, y=-0.21052356609516198, z=2.883642273506047, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=1, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=1, p2=2, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=1, p2=3, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=3, p2=4, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=4, p2=5, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=6, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=6, p2=7, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=6, p2=8, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=9, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=10, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
-j:p1=0, p2=11, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=1.0, vg=1.0, vb=1.0
+p:x=0.0, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=0.806, sz=2.295, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.6610658177212956, y=0.0, z=0.0, sh=2, s=1.0, sx=0.806, sy=1.0, sz=0.806, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.669522581015868, y=-0.12927953115999094, z=1.770803754024758, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.5149067817465802, y=-0.12852148117052686, z=1.7757109168238943, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.275, as=0.25, rx=-1.277, ry=-1.087, rz=-0.9208, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=3.491120795397971, y=0.0627093264475479, z=3.542562176271334, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.4085, ry=1.0807, rz=0.5977, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=4.82498021179015, y=-1.4556859677056804, z=3.7057221690326423, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=-0.9279, ry=-0.2806, rz=-0.7292, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.044122892122303, y=0.0, z=0.0, sh=3, s=1.0, sx=1.0144, sy=0.903, sz=0.903, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=0.0, ry=0.271, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.1225041839451873, y=0.3558613626799459, z=1.8896569415253044, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=3.2159989925040344, y=-0.15022914055334208, z=2.057760603467444, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.0846131653683386, y=-0.09317957887309433, z=-3.5838606901740344, sh=2, s=1.0, sx=1.273, sy=0.133, sz=1.509, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=-0.9744, ry=-1.5695, rz=1.1659, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=0.1364642552368182, y=0.619565647570761, z=3.289951226640109, sh=3, s=1.0, sx=0.8736, sy=0.8736, sz=0.8736, h=0.0, dn=1.0, fr=0.4, ing=0.25, as=0.25, rx=0.3229, ry=-0.3828, rz=1.5117, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.6422082610960242, y=-0.21052356609516198, z=2.883642273506047, sh=1, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.4, ing=0.22727272727272727, as=0.25, rx=1.3416, ry=-1.3967, rz=1.1368, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=1, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=2, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=3, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=3, p2=4, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=4, p2=5, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=6, sh=2, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=6, p2=7, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=6, p2=8, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=9, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=10, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=11, sh=1, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
 n:p=0, j=-1, d="Gpart:ry=0.0, rz=0.0", i=, Vstyle=neuro
 n:p=1, j=-1, d="N:in=0.8, fo=0.04, si=2.0, s=0.0", i=, Vstyle=neuro
Index: cpp/tests/genoconv_test-complex.goal
===================================================================
--- cpp/tests/genoconv_test-complex.goal	(revision 1069)
+++ cpp/tests/genoconv_test-complex.goal	(revision 1143)
@@ -7,9 +7,9 @@
 *** Converted:
 Genotype:
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.15625
+p:2.0, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -20,38 +20,33 @@
 Comment: 
 Conversion map:
-{ [0-1] -> [0-52]
-  [2] -> [53-110,166-222]
-  [3-25] -> [278-297,309-325]
-  [26] -> [111-165,223-277]
-  [27-29] -> [298-308]
+{ [0-1] -> [0-34]
+  [2] -> [35-74,112-150]
+  [3-25] -> [188-207,219-235]
+  [26] -> [75-111,151-187]
+  [27-29] -> [208-218]
 }
-                  p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5 j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5 j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5 n:j=0, d=@:p=0.6543 n:j=1, d=G c:0, 1, -1.23456 
-             FI : p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 .................................................................................................................................................................................................................................................................................
-              X : .....................................................p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 .......................................................j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5 .......................................................................................................
-[@,p:0.6543,1:- : ......................................................................................................................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
-       1.23456] : ......................................................................................................................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
-              X : ...............................................................................................................p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5 .........................................................j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5 ................................................
-            [G] : ..........................................................................................................................................................................................................................................................................................................n:j=1, d=G .................
+                  p:fr=1.12, ing=0.53125, as=0.15625 p:1.0, fr=1.12, ing=0.53125, as=0.15625 p:2.0, fr=0.976, ing=0.475, as=0.175 j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625 j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175 n:j=0, d=@:p=0.6543 n:j=1, d=G c:0, 1, -1.23456 
+             FI : p:fr=1.12, ing=0.53125, as=0.15625 .........................................................................................................................................................................................................
+              X : ...................................p:1.0, fr=1.12, ing=0.53125, as=0.15625 .....................................j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625 .....................................................................................
+[@,p:0.6543,1:- : ............................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
+       1.23456] : ............................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
+              X : ...........................................................................p:2.0, fr=0.976, ing=0.475, as=0.175 .......................................j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175 ................................................
+            [G] : ................................................................................................................................................................................................................n:j=1, d=G .................
 Reverse conversion map:
-{ [0-52] -> [0-1]
-  [53-110] -> [2]
-  [111-165] -> [26]
-  [166-222] -> [2]
-  [223-277] -> [26]
-  [278-297] -> [3-25]
-  [298-308] -> [27-29]
-  [309-325] -> [3-25]
+{ [0-34] -> [0-1]
+  [35-74] -> [2]
+  [75-111] -> [26]
+  [112-150] -> [2]
+  [151-187] -> [26]
+  [188-207] -> [3-25]
+  [208-218] -> [27-29]
+  [219-235] -> [3-25]
 }
                                                 FIX[@,p:0.6543,1:-1.23456]X[G]
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0 : FI............................
-                                     .5, 0.5  : FI............................
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0 : ..X...........................
-                                .5, 0.5, 0.5  : ..X...........................
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, : ..........................X...
-                                    0.5, 0.5  : ..........................X...
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0. : ..X...........................
-                                 5, 0.5, 0.5  : ..X...........................
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, : ..........................X...
-                                    0.5, 0.5  : ..........................X...
+          p:fr=1.12, ing=0.53125, as=0.15625  : FI............................
+     p:1.0, fr=1.12, ing=0.53125, as=0.15625  : ..X...........................
+        p:2.0, fr=0.976, ing=0.475, as=0.175  : ..........................X...
+      j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625  : ..X...........................
+        j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175  : ..........................X...
                          n:j=0, d=@:p=0.6543  : ...[@,p:0.6543,1:-1.23456]....
                                   n:j=1, d=G  : ...........................[G]
@@ -77,25 +72,20 @@
                                                 Parts     Joints    Neurons
                                                 012345678901234567890123456789
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0 : 0.............................
-                                     .5, 0.5  : 0.............................
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0 : .1............................
-                                .5, 0.5, 0.5  : .1............................
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, : ..2...........................
-                                    0.5, 0.5  : ..2...........................
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0. : ..........0...................
-                                 5, 0.5, 0.5  : ..........0...................
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, : ...........1..................
-                                    0.5, 0.5  : ...........1..................
+          p:fr=1.12, ing=0.53125, as=0.15625  : 0.............................
+     p:1.0, fr=1.12, ing=0.53125, as=0.15625  : .1............................
+        p:2.0, fr=0.976, ing=0.475, as=0.175  : ..2...........................
+      j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625  : ..........0...................
+        j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175  : ...........1..................
                          n:j=0, d=@:p=0.6543  : ....................0.........
                                   n:j=1, d=G  : .....................1........
                             c:0, 1, -1.23456  : ....................0.........
-{ [0-52] -> [0]
-  [53-110] -> [1]
-  [111-165] -> [2]
-  [166-222] -> [10]
-  [223-277] -> [11]
-  [278-297] -> [20]
-  [298-308] -> [21]
-  [309-325] -> [20]
+{ [0-34] -> [0]
+  [35-74] -> [1]
+  [75-111] -> [2]
+  [112-150] -> [10]
+  [151-187] -> [11]
+  [188-207] -> [20]
+  [208-218] -> [21]
+  [219-235] -> [20]
 }
 
Index: cpp/tests/genoconv_test-default.goal
===================================================================
--- cpp/tests/genoconv_test-default.goal	(revision 1069)
+++ cpp/tests/genoconv_test-default.goal	(revision 1143)
@@ -7,7 +7,7 @@
 *** Converted:
 Genotype:
-p:vr=0.5, 0.5, 0.5
-p:1.0, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
+p:
+p:1.0
+j:0, 1, dx=1.0, 0.0, 0.0
 
 Format: 0
@@ -15,14 +15,13 @@
 Comment: 
 Conversion map:
-{ [0] -> [0-85]
+{ [0] -> [0-33]
 }
-                  p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5 j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 
-              X : p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5 j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 
+                  p: p:1.0 j:0, 1, dx=1.0, 0.0, 0.0 
+              X : p: p:1.0 j:0, 1, dx=1.0, 0.0, 0.0 
 Reverse conversion map:
-{ [0-85] -> [0]
+{ [0-33] -> [0]
 }
                                                 X
-p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5 j: : X
-    0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : X
+           p: p:1.0 j:0, 1, dx=1.0, 0.0, 0.0  : X
 
 Model map for f1 genotype:
@@ -36,10 +35,10 @@
                                                 Parts     Joints    Neurons
                                                 012345678901234567890123456789
-                          p:vr=0.5, 0.5, 0.5  : 0.............................
-                     p:1.0, vr=0.5, 0.5, 0.5  : .1............................
-  j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ..........0...................
-{ [0-18] -> [0]
-  [19-42] -> [1]
-  [43-85] -> [10]
+                                          p:  : 0.............................
+                                       p:1.0  : .1............................
+                    j:0, 1, dx=1.0, 0.0, 0.0  : ..........0...................
+{ [0-2] -> [0]
+  [3-8] -> [1]
+  [9-33] -> [10]
 }
 
Index: cpp/tests/genoconv_test-simplemultiply.goal
===================================================================
--- cpp/tests/genoconv_test-simplemultiply.goal	(revision 1069)
+++ cpp/tests/genoconv_test-simplemultiply.goal	(revision 1143)
@@ -7,17 +7,17 @@
 *** Converted:
 Genotype:
-p:vr=0.5, 0.5, 0.5
-p:1.0, vr=0.5, 0.5, 0.5
-p:2.0, vr=0.5, 0.5, 0.5
-p:3.0, vr=0.5, 0.5, 0.5
-p:4.0, vr=0.5, 0.5, 0.5
-p:5.0, vr=0.5, 0.5, 0.5
-p:6.0, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
-j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
-j:3, 4, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
-j:4, 5, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
-j:5, 6, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
+p:
+p:1.0
+p:2.0
+p:3.0
+p:4.0
+p:5.0
+p:6.0
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.0
+j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0
+j:3, 4, dx=1.0, 0.0, 0.0
+j:4, 5, dx=1.0, 0.0, 0.0
+j:5, 6, dx=1.0, 0.0, 0.0
 
 Format: 0
@@ -25,51 +25,48 @@
 Comment: 
 Conversion map:
-{ [1] -> [0-66,163-248]
+{ [1] -> [0-14,39-88]
   [2] -> []
-  [3] -> [43-66]
+  [3] -> [9-14]
   [4] -> []
-  [5] -> [67-138,249-389]
+  [5] -> [15-32,89-175]
   [6] -> []
-  [7] -> [115-138]
-  [8] -> [139-162,390-432]
+  [7] -> [27-32]
+  [8] -> [33-38,176-200]
   [9] -> []
-  [10] -> [115-138]
+  [10] -> [27-32]
 }
-                  p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5 p:2.0, vr=0.5, 0.5, 0.5 p:3.0, vr=0.5, 0.5, 0.5 p:4.0, vr=0.5, 0.5, 0.5 p:5.0, vr=0.5, 0.5, 0.5 p:6.0, vr=0.5, 0.5, 0.5 j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:1, 2, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:3, 4, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:4, 5, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:5, 6, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 
-              2 : .................................................................................................................................................................................................................................................................................................................................................................................................................................................
-              X : p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5 p:2.0, vr=0.5, 0.5, 0.5 ................................................................................................j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:1, 2, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 ........................................................................................................................................................................................
-              2 : .................................................................................................................................................................................................................................................................................................................................................................................................................................................
-              r : ...........................................p:2.0, vr=0.5, 0.5, 0.5 ..............................................................................................................................................................................................................................................................................................................................................................................
-              3 : .................................................................................................................................................................................................................................................................................................................................................................................................................................................
-              X : ...................................................................p:3.0, vr=0.5, 0.5, 0.5 p:4.0, vr=0.5, 0.5, 0.5 p:5.0, vr=0.5, 0.5, 0.5 ..............................................................................................................j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:3, 4, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j:4, 5, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 ...........................................
-              2 : .................................................................................................................................................................................................................................................................................................................................................................................................................................................
-              ( : ...................................................................................................................p:5.0, vr=0.5, 0.5, 0.5 ......................................................................................................................................................................................................................................................................................................
-              X : ...........................................................................................................................................p:6.0, vr=0.5, 0.5, 0.5 ...................................................................................................................................................................................................................................j:5, 6, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 
-              2 : .................................................................................................................................................................................................................................................................................................................................................................................................................................................
-              ) : ...................................................................................................................p:5.0, vr=0.5, 0.5, 0.5 ......................................................................................................................................................................................................................................................................................................
+                  p: p:1.0 p:2.0 p:3.0 p:4.0 p:5.0 p:6.0 j:0, 1, dx=1.0, 0.0, 0.0 j:1, 2, dx=1.0, 0.0, 0.0 j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0 j:3, 4, dx=1.0, 0.0, 0.0 j:4, 5, dx=1.0, 0.0, 0.0 j:5, 6, dx=1.0, 0.0, 0.0 
+              2 : .........................................................................................................................................................................................................
+              X : p: p:1.0 p:2.0 ........................j:0, 1, dx=1.0, 0.0, 0.0 j:1, 2, dx=1.0, 0.0, 0.0 ................................................................................................................
+              2 : .........................................................................................................................................................................................................
+              r : .........p:2.0 ..........................................................................................................................................................................................
+              3 : .........................................................................................................................................................................................................
+              X : ...............p:3.0 p:4.0 p:5.0 ........................................................j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0 j:3, 4, dx=1.0, 0.0, 0.0 j:4, 5, dx=1.0, 0.0, 0.0 .........................
+              2 : .........................................................................................................................................................................................................
+              ( : ...........................p:5.0 ........................................................................................................................................................................
+              X : .................................p:6.0 .........................................................................................................................................j:5, 6, dx=1.0, 0.0, 0.0 
+              2 : .........................................................................................................................................................................................................
+              ) : ...........................p:5.0 ........................................................................................................................................................................
 Reverse conversion map:
-{ [0-42] -> [1]
-  [43-66] -> [1,3]
-  [67-114] -> [5]
-  [115-138] -> [5,7,10]
-  [139-162] -> [8]
-  [163-248] -> [1]
-  [249-389] -> [5]
-  [390-432] -> [8]
+{ [0-8] -> [1]
+  [9-14] -> [1,3]
+  [15-26] -> [5]
+  [27-32] -> [5,7,10]
+  [33-38] -> [8]
+  [39-88] -> [1]
+  [89-175] -> [5]
+  [176-200] -> [8]
 }
                                                 2X2r3X2(X2)
-  p:vr=0.5, 0.5, 0.5 p:1.0, vr=0.5, 0.5, 0.5  : .X.........
-                     p:2.0, vr=0.5, 0.5, 0.5  : .X.r.......
-p:3.0, vr=0.5, 0.5, 0.5 p:4.0, vr=0.5, 0.5, 0 : .....X.....
-                                          .5  : .....X.....
-                     p:5.0, vr=0.5, 0.5, 0.5  : .....X.(..)
-                     p:6.0, vr=0.5, 0.5, 0.5  : ........X..
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5 j: : .X.........
-    1, 2, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : .X.........
-j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0, vr=0.5, : .....X.....
- 0.5, 0.5 j:3, 4, dx=1.0, 0.0, 0.0, vr=0.5, 0 : .....X.....
-.5, 0.5 j:4, 5, dx=1.0, 0.0, 0.0, vr=0.5, 0.5 : .....X.....
-                                       , 0.5  : .....X.....
-  j:5, 6, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ........X..
+                                    p: p:1.0  : .X.........
+                                       p:2.0  : .X.r.......
+                                 p:3.0 p:4.0  : .....X.....
+                                       p:5.0  : .....X.(..)
+                                       p:6.0  : ........X..
+j:0, 1, dx=1.0, 0.0, 0.0 j:1, 2, dx=1.0, 0.0, : .X.........
+                                         0.0  : .X.........
+j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0 j:3, 4,  : .....X.....
+   dx=1.0, 0.0, 0.0 j:4, 5, dx=1.0, 0.0, 0.0  : .....X.....
+                    j:5, 6, dx=1.0, 0.0, 0.0  : ........X..
 
 Model map for fmultiply genotype:
@@ -102,31 +99,30 @@
                                                 Parts     Joints    Neurons
                                                 012345678901234567890123456789
-                          p:vr=0.5, 0.5, 0.5  : 0.............................
-                     p:1.0, vr=0.5, 0.5, 0.5  : .1............................
-                     p:2.0, vr=0.5, 0.5, 0.5  : ..2...........................
-                     p:3.0, vr=0.5, 0.5, 0.5  : ...3..........................
-                     p:4.0, vr=0.5, 0.5, 0.5  : ....4.........................
-                     p:5.0, vr=0.5, 0.5, 0.5  : .....5........................
-                     p:6.0, vr=0.5, 0.5, 0.5  : ......6.......................
-  j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ..........0...................
-  j:1, 2, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ...........1..................
-j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0, vr=0.5, : ............2.................
-                                    0.5, 0.5  : ............2.................
-  j:3, 4, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : .............3................
-  j:4, 5, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ..............4...............
-  j:5, 6, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5  : ...............5..............
-{ [0-18] -> [0]
-  [19-42] -> [1]
-  [43-66] -> [2]
-  [67-90] -> [3]
-  [91-114] -> [4]
-  [115-138] -> [5]
-  [139-162] -> [6]
-  [163-205] -> [10]
-  [206-248] -> [11]
-  [249-303] -> [12]
-  [304-346] -> [13]
-  [347-389] -> [14]
-  [390-432] -> [15]
+                                          p:  : 0.............................
+                                       p:1.0  : .1............................
+                                       p:2.0  : ..2...........................
+                                       p:3.0  : ...3..........................
+                                       p:4.0  : ....4.........................
+                                       p:5.0  : .....5........................
+                                       p:6.0  : ......6.......................
+                    j:0, 1, dx=1.0, 0.0, 0.0  : ..........0...................
+                    j:1, 2, dx=1.0, 0.0, 0.0  : ...........1..................
+        j:2, 3, rx=-1.5706, dx=1.0, 0.0, 0.0  : ............2.................
+                    j:3, 4, dx=1.0, 0.0, 0.0  : .............3................
+                    j:4, 5, dx=1.0, 0.0, 0.0  : ..............4...............
+                    j:5, 6, dx=1.0, 0.0, 0.0  : ...............5..............
+{ [0-2] -> [0]
+  [3-8] -> [1]
+  [9-14] -> [2]
+  [15-20] -> [3]
+  [21-26] -> [4]
+  [27-32] -> [5]
+  [33-38] -> [6]
+  [39-63] -> [10]
+  [64-88] -> [11]
+  [89-125] -> [12]
+  [126-150] -> [13]
+  [151-175] -> [14]
+  [176-200] -> [15]
 }
 
Index: cpp/tests/genomanipulation-complex.goal
===================================================================
--- cpp/tests/genomanipulation-complex.goal	(revision 1069)
+++ cpp/tests/genomanipulation-complex.goal	(revision 1143)
@@ -10,9 +10,9 @@
                   ( format 1 )
 Converted to f0:
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.15625
+p:2.0, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -55,7 +55,7 @@
 16.        i =                      s   info        Other properties
 17.   Vstyle = part                 s 0 0 part vis_style   Visual    
-18.       vr = 0.5                  f 0.0 1.0 1.0 red component  Visual    
-19.       vg = 0.5                  f 0.0 1.0 1.0 green component  Visual    
-20.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Visual    
+18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+20.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 However, there is a subset of properties which may be modified more freely.
@@ -71,7 +71,7 @@
  3.      ing = 0.53125              f 0.0 1.0 0.25 ingestion   Extra properties
  4.       as = 0.15625              f 0.0 1.0 0.25 assimilation  Extra properties
- 5.       vr = 0.5                  f 0.0 1.0 1.0 red component  Extra properties
- 6.       vg = 0.5                  f 0.0 1.0 1.0 green component  Extra properties
- 7.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Extra properties
+ 5.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 6.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 7.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 This set of properties can vary from release to release,
@@ -88,9 +88,9 @@
 Let's see f0... (check out part #1 !)
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -130,7 +130,7 @@
 22.        i =                      s   info        Other properties
 23.   Vstyle = joint                s 0 0 joint vis_style   Visual    
-24.       vr = 0.5                  f 0.0 1.0 1.0 red component  Visual    
-25.       vg = 0.5                  f 0.0 1.0 1.0 green component  Visual    
-26.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Visual    
+24.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+25.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+26.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 Actually, there are two kinds of Joints: delta and absolute.
@@ -142,9 +142,9 @@
 Position of the second Part referenced by this joint (part #2) is now changed:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.1, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, 0.1, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -156,9 +156,9 @@
 As you can see, Joint's delta fields have altered:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, -0.1, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, -0.1, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -169,9 +169,9 @@
 f0 is now:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -185,9 +185,9 @@
 The Part's position is changed, but everything else stays intact:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -201,7 +201,7 @@
  0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
- 2.       vr = 0.5                  f 0.0 1.0 1.0 red component  Extra properties
- 3.       vg = 0.5                  f 0.0 1.0 1.0 green component  Extra properties
- 4.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Extra properties
+ 2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 3.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 4.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 They can be changed just like Part's extra properties:
@@ -212,9 +212,9 @@
 And after that we have this genotype:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, stam=0.175, vr=0.5, 0.857946, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, stam=0.175, vg=0.857946
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -295,9 +295,9 @@
 And the full f0 genotype:
 
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.715189, vr=0.5, 0.5, 0.5
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, stam=0.175, vr=0.5, 0.857946, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.715189
+p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, stam=0.175, vg=0.857946
 n:j=0, d=@:p=0.6543
 n:j=1, d=ChMux
Index: cpp/tests/genomanipulation-default.goal
===================================================================
--- cpp/tests/genomanipulation-default.goal	(revision 1069)
+++ cpp/tests/genomanipulation-default.goal	(revision 1143)
@@ -10,7 +10,7 @@
                   ( format 1 )
 Converted to f0:
-p:vr=0.5, 0.5, 0.5
-p:1.0, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
+p:
+p:1.0
+j:0, 1, dx=1.0, 0.0, 0.0
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -55,7 +55,7 @@
 16.        i =                      s   info        Other properties
 17.   Vstyle = part                 s 0 0 part vis_style   Visual    
-18.       vr = 0.5                  f 0.0 1.0 1.0 red component  Visual    
-19.       vg = 0.5                  f 0.0 1.0 1.0 green component  Visual    
-20.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Visual    
+18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+20.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 However, there is a subset of properties which may be modified more freely.
@@ -71,7 +71,7 @@
  3.      ing = 0.25                 f 0.0 1.0 0.25 ingestion   Extra properties
  4.       as = 0.25                 f 0.0 1.0 0.25 assimilation  Extra properties
- 5.       vr = 0.5                  f 0.0 1.0 1.0 red component  Extra properties
- 6.       vg = 0.5                  f 0.0 1.0 1.0 green component  Extra properties
- 7.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Extra properties
+ 5.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 6.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 7.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 This set of properties can vary from release to release,
@@ -88,7 +88,7 @@
 Let's see f0... (check out part #1 !)
 
-p:vr=0.5, 0.5, 0.5
-p:1.0, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
+p:
+p:1.0, as=0.715189
+j:0, 1, dx=1.0, 0.0, 0.0
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -130,7 +130,7 @@
 22.        i =                      s   info        Other properties
 23.   Vstyle = joint                s 0 0 joint vis_style   Visual    
-24.       vr = 0.5                  f 0.0 1.0 1.0 red component  Visual    
-25.       vg = 0.5                  f 0.0 1.0 1.0 green component  Visual    
-26.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Visual    
+24.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+25.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+26.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 Actually, there are two kinds of Joints: delta and absolute.
@@ -142,7 +142,7 @@
 Position of the second Part referenced by this joint (part #1) is now changed:
 
-p:y=0.1, vr=0.5, 0.5, 0.5
-p:1.0, 0.1, 0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.1, vr=0.5, 0.5, 0.5
+p:y=0.1
+p:1.0, 0.1, 0.1, as=0.715189
+j:0, 1, dx=1.0, 0.0, 0.1
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -156,7 +156,7 @@
 As you can see, Joint's delta fields have altered:
 
-p:y=0.1, vr=0.5, 0.5, 0.5
-p:1.0, 0.1, -0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, -0.1, vr=0.5, 0.5, 0.5
+p:y=0.1
+p:1.0, 0.1, -0.1, as=0.715189
+j:0, 1, dx=1.0, 0.0, -0.1
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -169,7 +169,7 @@
 f0 is now:
 
-p:y=0.1, vr=0.5, 0.5, 0.5
-p:1.0, 0.1, -0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, vr=0.5, 0.5, 0.5
+p:y=0.1
+p:1.0, 0.1, -0.1, as=0.715189
+j:0, 1
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -185,7 +185,7 @@
 The Part's position is changed, but everything else stays intact:
 
-p:vr=0.5, 0.5, 0.5
-p:1.0, 0.1, -0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, vr=0.5, 0.5, 0.5
+p:
+p:1.0, 0.1, -0.1, as=0.715189
+j:0, 1
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -201,7 +201,7 @@
  0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
- 2.       vr = 0.5                  f 0.0 1.0 1.0 red component  Extra properties
- 3.       vg = 0.5                  f 0.0 1.0 1.0 green component  Extra properties
- 4.       vb = 0.5                  f 0.0 1.0 1.0 blue component  Extra properties
+ 2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 3.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 4.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 They can be changed just like Part's extra properties:
@@ -212,7 +212,7 @@
 And after that we have this genotype:
 
-p:vr=0.5, 0.5, 0.5
-p:1.0, 0.1, -0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, vr=0.5, 0.857946, 0.5
+p:
+p:1.0, 0.1, -0.1, as=0.715189
+j:0, 1, vg=0.857946
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
@@ -264,5 +264,5 @@
  [ data provided by Neuro::classProperties() ]
  #        id                      type  name        group (2 properties)
- 0.        p = 0.25                 f 0.01 1.0 0.25 power       Bend muscle
+ 0.        p = 0.25                 f 0.0 1.0 0.25 power       Bend muscle
  1.        r = 1.0                  f 0.0 1.0 1.0 bending range  Bend muscle
 and they can be changed:
@@ -308,7 +308,7 @@
 And the full f0 genotype:
 
-p:vr=0.5, 0.5, 0.5
-p:1.0, 0.1, -0.1, as=0.715189, vr=0.5, 0.5, 0.5
-j:0, 1, vr=0.5, 0.857946, 0.5
+p:
+p:1.0, 0.1, -0.1, as=0.715189
+j:0, 1, vg=0.857946
 n:p=1
 n:j=0, d=Sti
Index: cpp/tests/genomanipulation-fS.goal
===================================================================
--- cpp/tests/genomanipulation-fS.goal	(revision 1069)
+++ cpp/tests/genomanipulation-fS.goal	(revision 1143)
@@ -76,7 +76,7 @@
 16.        i =                      s   info        Other properties
 17.   Vstyle = part                 s 0 0 part vis_style   Visual    
-18.       vr = 1.0                  f 0.0 1.0 1.0 red component  Visual    
-19.       vg = 1.0                  f 0.0 1.0 1.0 green component  Visual    
-20.       vb = 1.0                  f 0.0 1.0 1.0 blue component  Visual    
+18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+20.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 However, there is a subset of properties which may be modified more freely.
@@ -92,7 +92,7 @@
  3.      ing = 0.22727272727272727  f 0.0 1.0 0.25 ingestion   Extra properties
  4.       as = 0.25                 f 0.0 1.0 0.25 assimilation  Extra properties
- 5.       vr = 1.0                  f 0.0 1.0 1.0 red component  Extra properties
- 6.       vg = 1.0                  f 0.0 1.0 1.0 green component  Extra properties
- 7.       vb = 1.0                  f 0.0 1.0 1.0 blue component  Extra properties
+ 5.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 6.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 7.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 This set of properties can vary from release to release,
@@ -166,7 +166,7 @@
 16.        i =                      s   info        Other properties
 17.   Vstyle = joint                s 0 0 joint vis_style   Visual    
-18.       vr = 1.0                  f 0.0 1.0 1.0 red component  Visual    
-19.       vg = 1.0                  f 0.0 1.0 1.0 green component  Visual    
-20.       vb = 1.0                  f 0.0 1.0 1.0 blue component  Visual    
+18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
+19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
+20.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Visual    
 
 Actually, there are two kinds of Joints: delta and absolute.
@@ -321,11 +321,11 @@
  0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
- 2.       vr = 1.0                  f 0.0 1.0 1.0 red component  Extra properties
- 3.       vg = 1.0                  f 0.0 1.0 1.0 green component  Extra properties
- 4.       vb = 1.0                  f 0.0 1.0 1.0 blue component  Extra properties
+ 2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
+ 3.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
+ 4.       vb = 0.5                  f 0.0 1.0 0.5 blue component  Extra properties
 
 They can be changed just like Part's extra properties:
       Change property #3 to random value from range [0..1]
-      Current value of 'vg' (green component) is '1.0'
+      Current value of 'vg' (green component) is '0.5'
       Setting new value... [ using ParamInterface::set() ]
       The value is now '0.857946'
@@ -405,5 +405,5 @@
  [ data provided by Neuro::classProperties() ]
  #        id                      type  name        group (2 properties)
- 0.        p = 0.899                f 0.01 1.0 1.0 power       Muscle for solids
+ 0.        p = 0.899                f 0.0 1.0 1.0 power       Muscle for solids
  1.        a = 0                    d 0 1 0 axis        Muscle for solids
 and they can be changed:
Index: cpp/tests/geometry_goals/apices.goal
===================================================================
--- cpp/tests/geometry_goals/apices.goal	(revision 1069)
+++ cpp/tests/geometry_goals/apices.goal	(revision 1143)
@@ -1,106 +1,106 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.306397278516871, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.00437234887125065, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.582829640190718, -0.010935283310924717, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.1617330779428592, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.23079784160957992, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3462511035509754, -0.49282661836185426, 5.196395321595119, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.12767222485226715, -0.5878358062199481, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.15458709820757, -0.6813035481671769, 5.732810604735787, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.022154803950853758, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.03728046848755125, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5162198503883072, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09761806321930593, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5523199315504896, -0.47819376013483655, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8511584154660576, 0.02397076726511645, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9213893470682804, -0.018529908164222914, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7741201627598497, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8443510943620725, -0.3930011064455903, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5591272526544748, -0.061221886424129804, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6293581842566975, -0.10372256185346916, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7711223807863544, 0.03602627831520982, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6802295073517902, 0.6266921627102248, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7246109850935071, 0.633737813573182, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5124732742205723, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.507271461254291, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.0075036509263915405, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.38581207288021535, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.25693077043438556, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3552059530941127, 0.4863858286069982, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.10715155311763129, 0.2699349428133118, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.16641222346402756, 0.1986698208780613, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09366135907091948, 0.06182930381990606, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3224077446169901, 0.09085832808674915, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.306397278516871, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.00437234887125065, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.582829640190718, -0.010935283310924717, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.1617330779428592, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.23079784160957992, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3462511035509754, -0.49282661836185426, 5.196395321595119, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.12767222485226715, -0.5878358062199481, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.15458709820757, -0.6813035481671769, 5.732810604735787, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.022154803950853758, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.03728046848755125, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5162198503883072, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09761806321930593, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5523199315504896, -0.47819376013483655, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8511584154660576, 0.02397076726511645, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9213893470682804, -0.018529908164222914, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7741201627598497, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8443510943620725, -0.3930011064455903, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5591272526544748, -0.061221886424129804, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6293581842566975, -0.10372256185346916, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7711223807863544, 0.03602627831520982, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6802295073517902, 0.6266921627102248, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7246109850935071, 0.633737813573182, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5124732742205723, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.507271461254291, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.0075036509263915405, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.38581207288021535, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.25693077043438556, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3552059530941127, 0.4863858286069982, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.10715155311763129, 0.2699349428133118, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.16641222346402756, 0.1986698208780613, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09366135907091948, 0.06182930381990606, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3224077446169901, 0.09085832808674915, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
 j:0, 1, sh=1
 j:0, 2, sh=1
Index: cpp/tests/geometry_goals/cuboid-linux.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid-linux.goal	(revision 1069)
+++ cpp/tests/geometry_goals/cuboid-linux.goal	(revision 1143)
@@ -3,19 +3,19 @@
 [WARN] Model.internalCheck: scale.y too big in Part #13 (adjusted)
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:sh=2, sx=5.0, sy=0.05, sz=0.05, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=5.0, sz=0.05, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=2.828427124746191, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:sh=2, sx=5.0, sy=0.05, sz=0.05, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=5.0, sz=0.05, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.828427124746191, rx=-2.375430003896009, 0.1936583004443267, 0.19739555984988078, vr=0.0, 0.0, 1.0
 p:sh=2, sx=5.0
 j:0, 1, sh=1
Index: cpp/tests/geometry_goals/cuboid_cylinder.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid_cylinder.goal	(revision 1069)
+++ cpp/tests/geometry_goals/cuboid_cylinder.goal	(revision 1143)
@@ -1,18 +1,18 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-1.0, -1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, -1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.000796009642568, -1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.000796009642568, -1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.000796009642568, 1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.000796009642568, 1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5003980048212839, sh=2, sx=3.8028205785189386, sy=0.05, sz=0.05, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vg=0.0, 0.0
-p:0.5003980048212839, sh=2, sx=0.05, sy=3.7511829133181505, sz=0.05, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vr=0.0, vb=0.0
-p:0.5003980048212839, sh=2, sx=0.05, sy=0.05, sz=2.8945979134971433, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-1.0, -1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, -1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.000796009642568, -1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.000796009642568, -1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.000796009642568, 1.0, -1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.000796009642568, 1.0, 1.0007960096425679, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5003980048212839, sh=2, sx=3.8028205785189386, sy=0.05, sz=0.05, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vr=1.0, 0.0, 0.0
+p:0.5003980048212839, sh=2, sx=0.05, sy=3.7511829133181505, sz=0.05, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vr=0.0, 1.0, 0.0
+p:0.5003980048212839, sh=2, sx=0.05, sy=0.05, sz=2.8945979134971433, rx=-2.3735588922712605, 0.5535749173597703, 0.44052972393438194, vr=0.0, 0.0, 1.0
 p:sh=2
 p:1.0, sh=3, ry=1.57
Index: cpp/tests/geometry_goals/cuboid_ellipsoid.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid_ellipsoid.goal	(revision 1069)
+++ cpp/tests/geometry_goals/cuboid_ellipsoid.goal	(revision 1143)
@@ -1,18 +1,18 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5, sh=2, sx=3.4641016151377544, sy=0.05, sz=0.05, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vg=0.0, 0.0
-p:0.5, sh=2, sx=0.05, sy=3.435088302436667, sz=0.05, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vr=0.0, vb=0.0
-p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.8284271247461907, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5, sh=2, sx=3.4641016151377544, sy=0.05, sz=0.05, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vr=1.0, 0.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=3.435088302436667, sz=0.05, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vr=0.0, 1.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.8284271247461907, rx=-2.6179938779914944, 0.6154797086703874, 0.7853981633974483, vr=0.0, 0.0, 1.0
 p:sh=2
 p:1.0, sh=1
Index: cpp/tests/geometry_goals/cylinder-linux.goal
===================================================================
--- cpp/tests/geometry_goals/cylinder-linux.goal	(revision 1069)
+++ cpp/tests/geometry_goals/cylinder-linux.goal	(revision 1143)
@@ -2,19 +2,19 @@
 [WARN] Model.internalCheck: scale.x too big in Part #12 (adjusted)
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:sh=2, sx=5.0, sy=0.05, sz=0.05, rz=0.19739555984988075, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=3.922322702763681, sz=0.05, rz=0.19739555984988075, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=2.0, rz=0.19739555984988075, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:sh=2, sx=5.0, sy=0.05, sz=0.05, rz=0.19739555984988075, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=3.922322702763681, sz=0.05, rz=0.19739555984988075, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.0, rz=0.19739555984988075, vr=0.0, 0.0, 1.0
 p:sh=3, sx=5.0
 j:0, 1, sh=1
Index: cpp/tests/geometry_goals/cylinder_ellipsoid.goal
===================================================================
--- cpp/tests/geometry_goals/cylinder_ellipsoid.goal	(revision 1069)
+++ cpp/tests/geometry_goals/cylinder_ellipsoid.goal	(revision 1143)
@@ -1,18 +1,18 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5, sh=2, sx=3.2348263655315033, sy=0.05, sz=0.05, rx=-3.141592653589793, rz=0.4821706085114592, vg=0.0, 0.0
-p:0.5, sh=2, sx=0.05, sy=2.8125392782429737, sz=0.05, rx=-3.141592653589793, rz=0.4821706085114592, vr=0.0, vb=0.0
-p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.0, rx=-3.141592653589793, rz=0.4821706085114592, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5, sh=2, sx=3.2348263655315033, sy=0.05, sz=0.05, rx=-3.141592653589793, rz=0.4821706085114592, vr=1.0, 0.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=2.8125392782429737, sz=0.05, rx=-3.141592653589793, rz=0.4821706085114592, vr=0.0, 1.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.0, rx=-3.141592653589793, rz=0.4821706085114592, vr=0.0, 0.0, 1.0
 p:sh=3
 p:1.0, sh=1
Index: cpp/tests/geometry_goals/ellipsoid-linux.goal
===================================================================
--- cpp/tests/geometry_goals/ellipsoid-linux.goal	(revision 1069)
+++ cpp/tests/geometry_goals/ellipsoid-linux.goal	(revision 1143)
@@ -2,19 +2,19 @@
 [WARN] Model.internalCheck: scale.x too big in Part #12 (adjusted)
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:sh=2, sx=5.0, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=2.0, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=2.0, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:5.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:sh=2, sx=5.0, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=2.0, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.0, vr=0.0, 0.0, 1.0
 p:sh=1, sx=5.0
 j:0, 1, sh=1
Index: cpp/tests/geometry_goals/f1.goal
===================================================================
--- cpp/tests/geometry_goals/f1.goal	(revision 1069)
+++ cpp/tests/geometry_goals/f1.goal	(revision 1143)
@@ -1,18 +1,18 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:y=-0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=-0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:4.009699, -0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:4.009699, -0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:4.009699, 0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:4.009699, 0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:2.0048495, sh=2, sx=4.029601229724972, sy=0.05, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vg=0.0, 0.0
-p:2.0048495, sh=2, sx=0.05, sy=1.8425049309676886, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, vb=0.0
-p:2.0048495, sh=2, sx=0.05, sy=0.05, sz=0.9058519381014852, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, 0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:y=-0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=-0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:4.009699, -0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:4.009699, -0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:4.009699, 0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:4.009699, 0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:2.0048495, sh=2, sx=4.029601229724972, sy=0.05, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=1.0, 0.0, 0.0
+p:2.0048495, sh=2, sx=0.05, sy=1.8425049309676886, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, 1.0, 0.0
+p:2.0048495, sh=2, sx=0.05, sy=0.05, sz=0.9058519381014852, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, 0.0, 1.0
 p:0.3995, sh=3, sx=0.3995, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
 p:0.7989983479760048, -0.44974999999696585, sh=3, sx=0.44975, sy=0.2, sz=0.2, rz=1.5707926535897934
Index: cpp/tests/geometry_goals/surface.goal
===================================================================
--- cpp/tests/geometry_goals/surface.goal	(revision 1069)
+++ cpp/tests/geometry_goals/surface.goal	(revision 1143)
@@ -1,228 +1,228 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.19999999999999996, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.2, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.19999999999999996, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.2, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.19999999999999996, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.19999999999999996, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19999999999999996, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.19999999999999996, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19999999999999996, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19999999999999996, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19999999999999996, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19999999999999996, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.19999999999999996, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.19999999999999996, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.306397278516871, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.00437234887125065, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.00912517136924244, -0.002731228523113735, 4.659476513333293, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.30639727851687093, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.06315540195605641, -0.002731228523113735, 4.575329414852503, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.004372348871250653, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.582829640190718, -0.010935283310924717, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.23079784160957992, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.1617330779428592, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.16173307794285918, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3377489772334282, -0.2011224008372915, 5.0442204198277665, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.23079784160957995, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.406813740900149, -0.2535957599263997, 4.99445491967389, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.582829640190718, -0.01093528331092472, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3462511035509754, -0.49282661836185426, 5.196395321595119, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.15458709820757, -0.6813035481671769, 5.732810604735787, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.12767222485226715, -0.5878358062199481, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.022154803950853758, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.12767222485226715, -0.5878358062199481, 5.756034962801281, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.22350422752396984, -0.49359734131728683, 5.487827321230947, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.022154803950853785, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.15458709820756997, -0.6813035481671769, 5.7328106047357865, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.25041910087927266, -0.5870650832645156, 5.4646029631654525, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3462511035509753, -0.49282661836185426, 5.196395321595118, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.03728046848755125, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5162198503883072, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09761806321930593, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.23940813098933383, -0.540285335530303, 5.768741749748778, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09761806321930594, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5162198503883071, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.2767501594379292, -0.6291526929975242, 5.742130367068854, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.03728046848755123, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5523199315504896, -0.47819376013483655, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9213893470682804, -0.018529908164222914, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8511584154660576, 0.02397076726511645, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8443510943620725, -0.3930011064455903, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7741201627598497, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6293581842566975, -0.10372256185346916, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5591272526544748, -0.061221886424129804, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5591272526544749, -0.06122188642412979, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8511584154660577, 0.02397076726511646, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6666237077071624, -0.20586115872019037, 5.80080196796413, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7741201627598499, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6293581842566974, -0.10372256185346918, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9213893470682802, -0.018529908164222925, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7368546393093849, -0.24836183414952975, 5.743694097803058, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5523199315504895, -0.4781937601348366, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.8443510943620723, -0.39300110644559033, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7711223807863544, 0.03602627831520982, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7246109850935071, 0.633737813573182, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6802295073517902, 0.6266921627102248, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.6802295073517902, 0.6266921627102247, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7034852051982139, 0.3278363950812386, 5.704944325146396, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7246109850935071, 0.6337378135731822, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7478666829399307, 0.33488204594419596, 5.615609879172972, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.7711223807863544, 0.036026278315209825, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5124732742205723, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.507271461254291, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.320190520724839, 0.7131319359802702, 5.708559243577382, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.30149627062999584, 0.7316707835300594, 5.612087298718179, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5124732742205722, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.5072714612542909, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.0075036509263915405, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.38581207288021535, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.25693077043438556, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3858120728802153, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.1634057507054312, 0.7258511910430342, 5.956255435366583, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.22990997310117564, 0.7082653929017534, 5.883674941380447, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.007503650926391547, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.2569307704343856, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3552059530941127, 0.4863858286069982, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.16641222346402756, 0.1986698208780613, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.10715155311763129, 0.2699349428133118, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.1071515531176313, 0.26993494281331176, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.34397738334533645, 0.4518802871483751, 6.389515594996323, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.16641222346402756, 0.19866982087806132, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.4032380536917327, 0.3806151652131246, 6.351972881380367, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3552059530941127, 0.48638582860699814, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09366135907091948, 0.06182930381990606, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3224077446169901, 0.09085832808674915, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.07037721981090438, 0.21569075955449296, 6.795394880235659, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.09366135907091948, 0.061829303819906055, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.07336894472004808, 0.11786391688991005, 6.774877608576227, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.3224077446169901, 0.09085832808674917, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.19999999999999996, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.2, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.19999999999999996, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.2, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.19999999999999996, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.19999999999999996, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19999999999999996, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.19999999999999996, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19999999999999996, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19999999999999996, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19999999999999996, 0.19999999999999996, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19999999999999996, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.19999999999999996, 0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.19999999999999996, -0.6, 3.6999999999999997, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.306397278516871, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.00437234887125065, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.07665292219654951, -0.29179868414827165, 4.7028355835101605, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.252367047930057, 0.07751842006426246, 4.815660326159002, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.00912517136924244, -0.002731228523113735, 4.659476513333293, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2341167051915721, -0.08298087711048993, 4.503292700507584, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.058402579458064624, 0.28633622710204415, 4.616117443156425, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13068315278336348, -0.29179868414827165, 4.618688485029371, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.30639727851687093, 0.07751842006426246, 4.731513227678213, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.06315540195605641, -0.002731228523113735, 4.575329414852503, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.004372348871250653, 0.28633622710204415, 4.531970344675636, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.582829640190718, -0.010935283310924717, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.23079784160957992, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.1617330779428592, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.16173307794285918, -0.44378287745276646, 5.055809047256533, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.4645911191810963, -0.28071393532369304, 5.304174759403446, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3377489772334282, -0.2011224008372915, 5.0442204198277665, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5137648765239973, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.23079784160957995, -0.4962562365418747, 5.0060435471026565, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5336558828478171, -0.33318729441280126, 5.254409259249569, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.406813740900149, -0.2535957599263997, 4.99445491967389, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2799715989524809, -0.17400422543999816, 4.734500580098211, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.582829640190718, -0.01093528331092472, 4.982866292245124, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3462511035509754, -0.49282661836185426, 5.196395321595119, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.15458709820757, -0.6813035481671769, 5.732810604735787, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.12767222485226715, -0.5878358062199481, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.022154803950853758, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.049069677306156606, -0.5435287209333771, 5.372891148790366, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.12767222485226715, -0.5878358062199481, 5.756034962801281, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.22350422752396984, -0.49359734131728683, 5.487827321230947, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.49607813235409626, -0.44366596170119654, 5.602763493671528, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.022154803950853785, -0.6369964628806059, 5.349666790724871, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.15458709820756997, -0.6813035481671769, 5.7328106047357865, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.25041910087927266, -0.5870650832645156, 5.4646029631654525, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3462511035509753, -0.49282661836185426, 5.196395321595118, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5229930057093991, -0.5371337036484253, 5.5795391356060335, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.03728046848755125, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5162198503883072, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09761806321930593, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.38119819875936173, -0.41155590379516416, 5.537821178800845, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4788778219397118, -0.4917872077696742, 5.9428170171472345, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.23940813098933383, -0.540285335530303, 5.768741749748778, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09761806321930594, -0.6690147672654418, 5.999662320696711, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4185402272079571, -0.5004232612623853, 5.511209796120921, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5162198503883071, -0.5806545652368954, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.2767501594379292, -0.6291526929975242, 5.742130367068854, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.03728046848755123, -0.677650820758153, 5.5680550996703975, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.1349600916679013, -0.757882124732663, 5.973050938016787, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5523199315504896, -0.47819376013483655, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9213893470682804, -0.018529908164222914, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8511584154660576, 0.02397076726511645, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8443510943620725, -0.3930011064455903, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7741201627598497, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6293581842566975, -0.10372256185346916, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5591272526544748, -0.061221886424129804, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5591272526544749, -0.06122188642412979, 5.5609603680262305, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8511584154660577, 0.02397076726511646, 5.856696756900341, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6666237077071624, -0.20586115872019037, 5.80080196796413, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7741201627598499, -0.35050043101625095, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6293581842566974, -0.10372256185346918, 5.503852497865158, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9213893470682802, -0.018529908164222925, 5.799588886739269, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7368546393093849, -0.24836183414952975, 5.743694097803058, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5523199315504895, -0.4781937601348366, 5.687799308866847, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.8443510943620723, -0.39300110644559033, 5.983535697740957, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7711223807863544, 0.03602627831520982, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7246109850935071, 0.633737813573182, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6802295073517902, 0.6266921627102248, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.4356574015279653, 0.3123942647183263, 5.570669203880297, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.6802295073517902, 0.6266921627102247, 5.716961091457066, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7034852051982139, 0.3278363950812386, 5.704944325146396, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.9713130088684625, 0.34327852544415083, 5.839219446412495, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.48003887926968214, 0.3194399155812837, 5.481334757906873, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7246109850935071, 0.6337378135731822, 5.627626645483642, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7478666829399307, 0.33488204594419596, 5.615609879172972, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.7711223807863544, 0.036026278315209825, 5.603593112862302, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-1.0156944866101794, 0.3503241763071082, 5.749885000439071, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5124732742205723, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.507271461254291, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.11441533010054392, 0.4948379405501654, 5.706485000897186, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.10921351713426258, 0.9112595002990505, 5.787516017910238, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.320190520724839, 0.7131319359802702, 5.708559243577382, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5259657113491341, 0.9314259314103751, 5.710633486257579, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09572108000570076, 0.5133767880999546, 5.610013056037983, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09051926703941943, 0.9297983478488396, 5.691044073051034, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.30149627062999584, 0.7316707835300594, 5.612087298718179, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5124732742205722, 0.5335432192112792, 5.5331305243853235, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.5072714612542909, 0.9499647789601643, 5.614161541398375, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.0075036509263915405, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.38581207288021535, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.25693077043438556, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.13638495337222126, 0.43074950496904363, 6.002998043207454, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3858120728802153, 0.7373251707316616, 6.1572623398420046, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.1634057507054312, 0.7258511910430342, 5.956255435366583, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.19042654803864115, 1.0209528771170246, 5.909512827525712, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2028891757679657, 0.4131637068277628, 5.9304175492213185, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45231629527595973, 0.7197393725903808, 6.084681845855869, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.22990997310117564, 0.7082653929017534, 5.883674941380447, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.007503650926391547, 0.696791413213126, 5.682668036905026, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.2569307704343856, 1.003367078975744, 5.836932333539576, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3552059530941127, 0.4863858286069982, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.16641222346402756, 0.1986698208780613, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.10715155311763129, 0.2699349428133118, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.1071515531176313, 0.26993494281331176, 6.361065325898239, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3920094839429565, 0.34610962375450155, 6.666111842399284, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.34397738334533645, 0.4518802871483751, 6.389515594996323, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.5808032135730417, 0.6338256314834384, 6.417965864094406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.16641222346402756, 0.19866982087806132, 6.323522612282283, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.45127015428935274, 0.2748445018192511, 6.628569128783328, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.4032380536917327, 0.3806151652131246, 6.351972881380367, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3552059530941127, 0.48638582860699814, 6.075376633977406, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.6400638839194379, 0.5625605095481879, 6.3804231504784505, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09366135907091948, 0.06182930381990606, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3224077446169901, 0.09085832808674915, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17866158008603766, 0.24269634835765386, 6.630318006266937, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09665308398006318, 0.15965614648448898, 7.038213742257521, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.07037721981090438, 0.21569075955449296, 6.795394880235659, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.31941601970784644, 0.18868517075133207, 6.960471754204382, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.17566985517689399, 0.14486950569307094, 6.6098007346075045, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.09366135907091948, 0.061829303819906055, 7.017696470598088, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.07336894472004808, 0.11786391688991005, 6.774877608576227, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.24039924851101563, 0.17389852995991403, 6.532058746554365, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.3224077446169901, 0.09085832808674917, 6.939954482544949, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
 j:0, 1, sh=1
 j:0, 2, sh=1
Index: cpp/tests/geometry_goals/volume.goal
===================================================================
--- cpp/tests/geometry_goals/volume.goal	(revision 1069)
+++ cpp/tests/geometry_goals/volume.goal	(revision 1143)
@@ -1,21 +1,21 @@
 //0s
-p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
-p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
-p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
-p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
-p:-0.6017946928078557, -0.3177621035502328, 5.768860410817496, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, -0.3177621035502328, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, -0.3177621035502328, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, -0.3177621035502328, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, 0.17085604539282628, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, 0.17085604539282628, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, 0.17085604539282628, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:-0.16463920115910846, 0.17085604539282628, 6.725147214423328, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, -0.3177621035502328, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, -0.3177621035502328, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, 0.17085604539282628, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, 0.17085604539282628, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, 0.17085604539282628, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
-p:0.27251629048963877, 0.17085604539282628, 6.725147214423328, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vr=1.0, 0.0, 1.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vr=1.0, 0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
+p:-0.6017946928078557, -0.3177621035502328, 5.768860410817496, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, -0.3177621035502328, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, -0.3177621035502328, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, -0.3177621035502328, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, 0.17085604539282628, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, 0.17085604539282628, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, 0.17085604539282628, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:-0.16463920115910846, 0.17085604539282628, 6.725147214423328, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, -0.3177621035502328, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, -0.3177621035502328, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, 0.17085604539282628, 3.378143401802916, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, 0.17085604539282628, 3.856286803605832, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, 0.17085604539282628, 4.334430205408748, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:0.27251629048963877, 0.17085604539282628, 6.725147214423328, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
 j:0, 1, sh=1
 j:0, 2, sh=1
Index: cpp/tests/multiline_f0_test-complex.goal
===================================================================
--- cpp/tests/multiline_f0_test-complex.goal	(revision 1069)
+++ cpp/tests/multiline_f0_test-complex.goal	(revision 1143)
@@ -3,9 +3,9 @@
                   ( format 1 )
 Converted to f0:
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5
+p:fr=1.12, ing=0.53125, as=0.15625
+p:1.0, fr=1.12, ing=0.53125, as=0.15625
+p:2.0, fr=0.976, ing=0.475, as=0.175
+j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
+j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
Index: cpp/tests/multiline_f0_test-default.goal
===================================================================
--- cpp/tests/multiline_f0_test-default.goal	(revision 1069)
+++ cpp/tests/multiline_f0_test-default.goal	(revision 1143)
@@ -3,7 +3,7 @@
                   ( format 1 )
 Converted to f0:
-p:vr=0.5, 0.5, 0.5
-p:1.0, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, vr=0.5, 0.5, 0.5
+p:
+p:1.0
+j:0, 1, dx=1.0, 0.0, 0.0
 n:p=1
 n:j=0, d="|:p=0.25,r=1"
Index: cpp/tests/multiline_f0_test-fS.goal
===================================================================
--- cpp/tests/multiline_f0_test-fS.goal	(revision 1069)
+++ cpp/tests/multiline_f0_test-fS.goal	(revision 1143)
@@ -60,7 +60,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -83,7 +83,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -106,7 +106,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -129,7 +129,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -152,7 +152,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -175,7 +175,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -198,7 +198,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -221,7 +221,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -244,7 +244,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -267,7 +267,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -290,7 +290,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 p:
@@ -313,7 +313,7 @@
 i:
 Vstyle:part
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -336,7 +336,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -359,7 +359,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -382,7 +382,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -405,7 +405,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -428,7 +428,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -451,7 +451,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -474,7 +474,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -497,7 +497,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -520,7 +520,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -543,7 +543,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 j:
@@ -566,7 +566,7 @@
 i:
 Vstyle:joint
-vr:1.0
-vg:1.0
-vb:1.0
+vr:0.5
+vg:0.5
+vb:0.5
 
 n:
Index: cpp/tests/similarity_goals/distribution.goal
===================================================================
--- cpp/tests/similarity_goals/distribution.goal	(revision 1069)
+++ cpp/tests/similarity_goals/distribution.goal	(revision 1143)
@@ -1,6 +1,6 @@
-0.00	0.42	0.37	0.33	0.95	
-0.41	0.00	0.73	0.27	1.32	
-0.37	0.73	0.00	0.70	0.59	
-0.33	0.27	0.70	0.00	1.28	
-0.96	1.32	0.57	1.28	0.01	
+0.00	0.41	0.38	0.32	0.95	
+0.41	0.00	0.73	0.27	1.31	
+0.38	0.73	0.00	0.69	0.58	
+0.32	0.27	0.69	0.00	1.27	
+0.95	1.31	0.58	1.27	0.00	
 
