diff --git a/puredata/glsl_loader.pd b/puredata/glsl_loader.pd
deleted file mode 100644
index 9819883..0000000
--- a/puredata/glsl_loader.pd
+++ /dev/null
@@ -1,85 +0,0 @@
-#N canvas 604 90 796 614 10;
-#X obj 188 289 glsl_vertex;
-#X msg 90 272 print;
-#X obj 188 576 glsl_program;
-#X obj 293 515 pack 0 0;
-#X msg 90 423 print;
-#X obj 293 471 change;
-#X obj 338 316 change;
-#X msg 293 539 link \$1 \$2;
-#X msg 90 559 print;
-#X obj 188 440 glsl_fragment;
-#X floatatom 293 495 2 0 0 0 ID - -;
-#X floatatom 338 369 2 0 0 0 ID - -;
-#X obj 51 34 route bang;
-#X obj 188 131 gemhead 1;
-#X msg 188 153 1;
-#X obj 188 177 change;
-#X obj 188 201 t b;
-#X obj 434 627 change;
-#X obj 434 648 t b;
-#X obj 458 368 symbol;
-#X obj 458 343 t b;
-#X msg 434 579 0;
-#X obj 51 55 t b b b;
-#X msg 513 395 open glsl/gain.frag;
-#X obj 481 132 loadbang;
-#X obj 434 132 t b;
-#X obj 51 11 inlet gemlist;
-#X obj 188 670 outlet gemlist;
-#X obj 149 12 inlet shader-data;
-#X obj 434 670 outlet shader-init;
-#X obj 293 567 print [glsl] \$1;
-#X msg 234 259 open glsl/gain.vert;
-#X obj 74 458 t b;
-#X obj 97 210 t b;
-#X msg 234 226 set open glsl/\$1.vert;
-#X msg 513 368 set open glsl/\$1.frag;
-#X obj 481 175 t l l;
-#X obj 481 154 list append \$1;
-#X obj 212 62 print;
-#X connect 0 0 9 0;
-#X connect 0 1 6 0;
-#X connect 1 0 0 0;
-#X connect 2 0 27 0;
-#X connect 2 1 17 0;
-#X connect 3 0 7 0;
-#X connect 4 0 9 0;
-#X connect 5 0 10 0;
-#X connect 6 0 11 0;
-#X connect 6 0 20 0;
-#X connect 7 0 2 0;
-#X connect 7 0 30 0;
-#X connect 8 0 2 0;
-#X connect 9 0 2 0;
-#X connect 9 1 5 0;
-#X connect 10 0 3 0;
-#X connect 11 0 3 1;
-#X connect 12 0 22 0;
-#X connect 12 1 0 0;
-#X connect 13 0 14 0;
-#X connect 14 0 15 0;
-#X connect 15 0 16 0;
-#X connect 16 0 31 0;
-#X connect 17 0 18 0;
-#X connect 18 0 29 0;
-#X connect 19 0 23 0;
-#X connect 20 0 19 0;
-#X connect 21 0 17 0;
-#X connect 22 0 25 0;
-#X connect 22 1 32 0;
-#X connect 22 2 33 0;
-#X connect 23 0 9 0;
-#X connect 24 0 37 0;
-#X connect 25 0 21 0;
-#X connect 26 0 12 0;
-#X connect 28 0 2 0;
-#X connect 28 0 38 0;
-#X connect 31 0 0 0;
-#X connect 32 0 10 0;
-#X connect 33 0 31 0;
-#X connect 34 0 31 0;
-#X connect 35 0 23 0;
-#X connect 36 0 34 0;
-#X connect 36 1 35 0;
-#X connect 37 0 36 0;
diff --git a/puredata/layer.pd b/puredata/layer.pd
index 81bce79..e930098 100644
--- a/puredata/layer.pd
+++ b/puredata/layer.pd
@@ -1,4 +1,4 @@
-#N canvas 112 135 1221 604 10;
+#N canvas 70 135 1221 604 10;
 #X obj 391 283 << 8;
 #X obj 391 325 +;
 #X obj 469 285 << 8;
@@ -364,15 +364,14 @@
 #X connect 135 0 56 0;
 #X connect 136 0 113 0;
 #X restore 469 -163 pd video;
-#N canvas 820 90 701 649 video_render 1;
+#N canvas 6 90 1351 649 video_render 1;
 #X obj 232 95 inlet;
-#X text 309 316 Green;
-#X text 223 318 Red;
-#X text 395 317 Blue;
-#X msg 255 772 1;
-#X obj 255 725 loadbang;
+#X text 946 293 Green;
+#X text 866 293 Red;
+#X text 1032 293 Blue;
+#X msg 261 772 1;
+#X obj 261 725 loadbang;
 #X obj 231 694 translateXYZ;
-#X obj 482 748 t b;
 #X obj 232 161 alpha;
 #X obj 233 287 pix_alpha;
 #X obj 351 625 - 32768;
@@ -380,16 +379,7 @@
 #X msg 295 207 0;
 #X msg 257 207 1;
 #X obj 280 170 loadbang;
-#X msg 647 981 set 1 1 \$1 \$2 \$3;
-#X msg 375 1011 set 1 0 \$1 \$2 \$3;
-#X msg 872 966 set 0 1 \$1 \$2 \$3;
-#X obj 230 933 pix_texture;
-#X msg 1074 1023 set 0 0 \$1 \$2 \$3;
-#X obj 647 957 pack f f 5;
-#X obj 869 940 pack f f 5;
-#X obj 1074 986 pack f f 5;
-#X obj 438 985 pack f f 5;
-#N canvas 259 90 528 649 fx 0;
+#N canvas 257 90 528 649 fx 0;
 #X obj 284 -71 inlet;
 #X obj 228 614 outlet;
 #X msg 23 -19 BackDropKeyVFX;
@@ -1408,73 +1398,40 @@
 #X connect 62 0 41 0;
 #X connect 63 0 1 0;
 #X connect 63 1 62 0;
-#X restore 231 870 pd fx;
+#X restore 250 870 pd fx;
 #X obj 462 198 pack f f f;
-#X obj 754 221 pack f f f;
-#X obj 212 332 r \$0-c2;
-#X obj 303 330 r \$0-c3;
-#X obj 389 332 r \$0-c4;
-#X obj 475 335 r \$0-c1;
+#X obj 748 219 pack f f f;
+#X obj 849 313 r \$0-c2;
+#X obj 940 313 r \$0-c3;
+#X obj 1026 313 r \$0-c4;
+#X obj 1112 313 r \$0-c1;
 #X obj 254 597 r \$0-c18;
 #X obj 351 597 r \$0-c19;
-#X obj 371 693 r \$0-c15;
-#X obj 452 690 r \$0-c16;
-#X obj 414 829 r \$0-c32;
-#X obj 505 829 r \$0-c33;
-#X obj 649 776 r \$0-c34;
-#X obj 711 776 r \$0-c35;
-#X obj 212 365 * 0.0078125;
-#X obj 303 365 * 0.0078125;
-#X obj 389 365 * 0.0078125;
+#X obj 349 704 r \$0-c15;
+#X obj 434 702 r \$0-c16;
 #X obj 254 655 * 0.000244141;
 #X obj 351 664 * 0.000244141;
-#X obj 411 922 * 0.0625;
-#X obj 503 921 * 0.0625;
-#X obj 648 852 * 0.0625;
-#X obj 710 852 * 0.0625;
-#X obj 927 851 * 0.0625;
-#X obj 1053 861 * 0.0625;
-#X obj 1116 861 * 0.0625;
-#X obj 475 365 * 0.00392157;
+#X obj 1112 362 * 0.00392157;
 #X obj 368 152 * 0.00392157;
 #X obj 462 152 * 0.00392157;
 #X obj 556 152 * 0.00392157;
-#X obj 666 153 * 0.00392157;
-#X obj 763 153 * 0.00392157;
-#X obj 858 153 * 0.00392157;
+#X obj 660 151 * 0.00392157;
+#X obj 757 151 * 0.00392157;
+#X obj 852 151 * 0.00392157;
 #X obj 450 663 - 8;
-#X obj 371 719 * 0.0078125;
-#X obj 451 718 * 0.0078125;
+#X obj 349 730 * 0.0078125;
+#X obj 434 730 * 0.0078125;
 #X obj 450 580 r \$0-c17;
 #X obj 450 608 - 128;
 #X obj 450 636 * 0.125;
 #X obj 368 129 r \$0-c22;
 #X obj 462 129 r \$0-c23;
 #X obj 556 129 r \$0-c24;
-#X obj 666 130 r \$0-c25;
-#X obj 763 130 r \$0-c26;
-#X obj 1056 765 r \$0-c28;
-#X obj 1118 765 r \$0-c29;
-#X obj 866 723 r \$0-c30;
-#X obj 933 726 r \$0-c31;
-#X obj 387 795 pack f f 1;
+#X obj 660 128 r \$0-c25;
+#X obj 757 128 r \$0-c26;
+#X obj 365 806 pack f f 1;
 #X obj 231 835 scale XYZ;
-#X obj 858 130 r \$0-c27;
-#X obj 230 1080 curve3d;
-#X obj 484 770 delay 10;
-#X obj 931 804 - 127;
-#X obj 710 815 - 127;
-#X obj 648 815 - 127;
-#X obj 504 888 - 127;
-#X obj 413 888 - 127;
-#X obj 1055 824 - 127;
-#X obj 1117 824 - 127;
-#X obj 866 799 - 127;
-#X obj 862 851 * 0.0625;
-#X obj 758 596 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 65 958 loadbang;
-#X msg 65 985 1;
+#X obj 852 128 r \$0-c27;
 #X obj 301 63 r \$0-c46;
 #X obj 231 537 rotateXYZ;
 #X obj 325 503 - 128;
@@ -1483,8 +1440,6 @@
 #X obj 325 467 r \$0-c12;
 #X obj 385 467 r \$0-c13;
 #X obj 444 467 r \$0-c14;
-#X obj 230 1185 outlet;
-#X obj 21 468 glsl_loader gain;
 #N canvas 110 360 450 300 pack4 0;
 #X obj 30 39 inlet;
 #X obj 85 36 inlet;
@@ -1506,179 +1461,274 @@
 #X connect 6 1 4 3;
 #X connect 7 0 4 0;
 #X connect 7 1 4 1;
-#X restore 222 413 pd pack4;
-#X text 482 319 Alpha;
-#X obj 87 181 vradio 15 1 0 2 empty empty empty 0 -8 0 10 -262144 -1
--1 1;
-#X obj 48 352 spigot;
-#X obj 106 353 spigot;
-#X obj 109 288 - 1;
+#X restore 859 394 pd pack4;
+#X text 1116 290 Alpha;
 #X obj 462 175 t b f;
 #X obj 556 175 t b f;
-#X obj 858 178 t b f;
-#X obj 763 179 t b f;
-#X obj 65 1019 change;
-#X obj 172 961 t b a;
-#X msg 172 983 0;
-#X obj 65 1046 t b;
-#X obj 65 1078 s \$0-init;
-#X obj 758 561 r \$0-init;
-#X obj 673 906 t b f;
-#X obj 887 905 t b f;
-#X obj 464 951 t b f;
-#X obj 1083 920 t b f;
-#X obj 21 588 pix_texture;
-#X obj 21 690 rectangle 4 3;
-#X msg 95 622 \$3 \$2;
-#X obj 95 644 /;
-#X obj 95 666 * 4;
-#X msg 38 564 rectangle 1;
-#X obj 38 542 loadbang;
-#X msg 222 437 gain \$1 \$2 \$3 \$4;
-#X text 145 628;
-#X text 117 566;
-#X connect 0 0 8 0;
-#X connect 4 0 74 1;
+#X obj 852 176 t b f;
+#X obj 757 177 t b f;
+#X msg 859 418 gain \$1 \$2 \$3 \$4;
+#X obj 795 334 t b;
+#X obj 427 765 t b f;
+#X obj 849 361 * 0.0078126;
+#X obj 940 362 * 0.0078126;
+#X obj 1026 362 * 0.0078126;
+#X obj 849 335 float;
+#X obj 940 335 float;
+#X obj 1026 335 float;
+#X obj 1112 335 float;
+#X msg 772 985 set 1 1 \$1 \$2 \$3;
+#X msg 520 965 set 1 0 \$1 \$2 \$3;
+#X msg 997 970 set 0 1 \$1 \$2 \$3;
+#X obj 223 917 pix_texture;
+#X obj 609 905 t b;
+#X obj 798 910 t b;
+#X obj 1001 907 t b;
+#X msg 1172 972 set 0 0 \$1 \$2 \$3;
+#X obj 1181 869 t b;
+#X obj 772 961 pack f f 5;
+#X obj 994 944 pack f f 5;
+#X obj 1172 935 pack f f 5;
+#X obj 583 939 pack f f 5;
+#X obj 559 783 r \$0-c32;
+#X obj 650 783 r \$0-c33;
+#X obj 774 780 r \$0-c34;
+#X obj 836 780 r \$0-c35;
+#X obj 556 876 * 0.0625;
+#X obj 648 875 * 0.0625;
+#X obj 773 856 * 0.0625;
+#X obj 835 856 * 0.0625;
+#X obj 1052 855 * 0.0625;
+#X obj 1151 810 * 0.0625;
+#X obj 1214 810 * 0.0625;
+#X obj 1154 714 r \$0-c28;
+#X obj 1216 714 r \$0-c29;
+#X obj 991 727 r \$0-c30;
+#X obj 1058 730 r \$0-c31;
+#X obj 223 1064 curve3d;
+#X obj 1056 808 - 127;
+#X obj 835 819 - 127;
+#X obj 773 819 - 127;
+#X obj 649 842 - 127;
+#X obj 558 842 - 127;
+#X obj 1153 773 - 127;
+#X obj 1215 773 - 127;
+#X obj 991 803 - 127;
+#X obj 987 855 * 0.0625;
+#X floatatom 1000 831 5 0 0 0 - - -;
+#X obj 883 600 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 71 921 t b;
+#X obj 71 967 spigot;
+#X obj 136 851 loadbang;
+#X msg 135 885 1;
+#X msg 160 982 0;
+#X obj 881 660 delay 10;
+#X obj 160 955 delay 10;
+#X obj 694 313 vsl 15 128 0 2 0 0 empty empty empty 0 -9 0 10 -258113
+-1 -1 6350 1;
+#X obj 714 313 vsl 15 128 0 2 0 0 empty empty empty 0 -9 0 10 -4034
+-1 -1 6350 1;
+#X obj 734 313 vsl 15 128 0 2 0 0 empty empty empty 0 -9 0 10 -4160
+-1 -1 6350 1;
+#X obj 694 257 loadbang;
+#X msg 602 476 gain \$1 \$2 \$3 \$4;
+#X obj 754 313 vsl 15 128 0 2 0 0 empty empty empty 0 -9 0 10 -1 -262144
+-1 6350 1;
+#X msg 694 279 1;
+#N canvas 0 50 450 300 pack4 0;
+#X obj 141 102 t b f;
+#X obj 181 102 t b f;
+#X obj 221 102 t b f;
+#X obj 101 162 pack 1 1 1 1;
+#X obj 101 42 inlet;
+#X obj 141 42 inlet;
+#X obj 181 42 inlet;
+#X obj 221 42 inlet;
+#X obj 101 204 outlet;
+#X connect 0 0 3 0;
+#X connect 0 1 3 1;
+#X connect 1 0 3 0;
+#X connect 1 1 3 2;
+#X connect 2 0 3 0;
+#X connect 2 1 3 3;
+#X connect 3 0 8 0;
+#X connect 4 0 3 0;
+#X connect 5 0 0 0;
+#X connect 6 0 1 0;
+#X connect 7 0 2 0;
+#X restore 694 464 pd pack4;
+#X text 390 313 Green;
+#X text 309 311 Red;
+#X text 472 311 Blue;
+#X obj 301 332 r \$0-c2;
+#X obj 392 332 r \$0-c3;
+#X obj 468 331 r \$0-c4;
+#X obj 563 328 r \$0-c1;
+#X obj 301 372 * 0.0078125;
+#X obj 392 374 * 0.0078125;
+#X obj 468 375 * 0.0078125;
+#X obj 563 373 * 0.00392157;
+#X obj 285 423 colorRGB 1 1 1;
+#X obj 619 542 ev_glslxxx gain;
+#X connect 0 0 7 0;
+#X connect 4 0 46 1;
 #X connect 5 0 4 0;
-#X connect 6 0 74 0;
-#X connect 7 0 77 0;
-#X connect 8 0 9 0;
-#X connect 9 0 104 0;
-#X connect 9 0 103 0;
-#X connect 10 0 43 0;
-#X connect 11 0 42 0;
-#X connect 12 0 9 2;
-#X connect 13 0 9 1;
-#X connect 14 0 13 0;
-#X connect 14 0 12 0;
-#X connect 15 0 76 0;
-#X connect 16 0 76 0;
-#X connect 17 0 76 0;
-#X connect 18 0 76 0;
-#X connect 18 0 111 0;
-#X connect 19 0 76 0;
-#X connect 20 0 15 0;
-#X connect 21 0 17 0;
-#X connect 22 0 19 0;
-#X connect 23 0 16 0;
-#X connect 24 0 18 0;
-#X connect 25 0 9 3;
-#X connect 26 0 9 4;
-#X connect 27 0 39 0;
-#X connect 28 0 40 0;
-#X connect 29 0 41 0;
-#X connect 30 0 51 0;
-#X connect 31 0 11 0;
-#X connect 32 0 10 0;
-#X connect 33 0 59 0;
-#X connect 34 0 60 0;
-#X connect 35 0 82 0;
-#X connect 36 0 81 0;
-#X connect 37 0 80 0;
-#X connect 38 0 79 0;
-#X connect 39 0 100 0;
-#X connect 40 0 100 1;
-#X connect 41 0 100 2;
-#X connect 42 0 6 1;
-#X connect 43 0 6 2;
-#X connect 44 0 23 0;
-#X connect 45 0 118 0;
-#X connect 46 0 20 0;
-#X connect 47 0 116 0;
-#X connect 48 0 117 0;
-#X connect 49 0 22 0;
-#X connect 50 0 119 0;
-#X connect 51 0 100 3;
-#X connect 52 0 25 0;
-#X connect 53 0 106 0;
-#X connect 54 0 107 0;
-#X connect 55 0 26 0;
-#X connect 56 0 109 0;
-#X connect 57 0 108 0;
-#X connect 58 0 6 3;
-#X connect 59 0 73 0;
-#X connect 60 0 73 1;
-#X connect 60 0 7 0;
-#X connect 61 0 62 0;
-#X connect 62 0 63 0;
-#X connect 63 0 58 0;
-#X connect 64 0 52 0;
-#X connect 65 0 53 0;
-#X connect 66 0 54 0;
-#X connect 67 0 55 0;
-#X connect 68 0 56 0;
-#X connect 69 0 83 0;
-#X connect 70 0 84 0;
-#X connect 71 0 85 0;
-#X connect 72 0 78 0;
-#X connect 73 0 74 2;
-#X connect 74 0 24 0;
-#X connect 75 0 57 0;
-#X connect 76 0 98 0;
-#X connect 77 0 73 0;
-#X connect 78 0 48 0;
-#X connect 79 0 47 0;
-#X connect 80 0 46 0;
-#X connect 81 0 45 0;
-#X connect 82 0 44 0;
-#X connect 83 0 49 0;
-#X connect 84 0 50 0;
-#X connect 85 0 86 0;
-#X connect 86 0 21 0;
-#X connect 87 0 85 0;
-#X connect 87 0 83 0;
-#X connect 87 0 84 0;
-#X connect 87 0 78 0;
-#X connect 87 0 79 0;
-#X connect 87 0 80 0;
-#X connect 87 0 81 0;
-#X connect 87 0 82 0;
-#X connect 88 0 89 0;
-#X connect 89 0 110 0;
-#X connect 90 0 8 1;
-#X connect 91 0 6 0;
-#X connect 92 0 91 1;
-#X connect 93 0 91 2;
-#X connect 94 0 91 3;
-#X connect 95 0 92 0;
-#X connect 96 0 93 0;
-#X connect 97 0 94 0;
-#X connect 99 0 120 0;
-#X connect 100 0 127 0;
-#X connect 102 0 103 1;
-#X connect 102 0 105 0;
-#X connect 103 0 99 0;
-#X connect 104 0 91 0;
-#X connect 105 0 104 1;
-#X connect 106 0 25 0;
-#X connect 106 1 25 1;
-#X connect 107 0 25 0;
-#X connect 107 1 25 2;
-#X connect 108 0 26 0;
-#X connect 108 1 26 2;
-#X connect 109 0 26 0;
-#X connect 109 1 26 1;
-#X connect 110 0 113 0;
-#X connect 111 0 112 0;
-#X connect 112 0 110 0;
-#X connect 113 0 114 0;
-#X connect 115 0 87 0;
-#X connect 116 0 20 0;
-#X connect 116 1 20 1;
-#X connect 117 0 21 0;
-#X connect 117 1 21 1;
-#X connect 118 0 23 0;
-#X connect 118 1 23 1;
-#X connect 119 0 22 0;
-#X connect 119 1 22 1;
-#X connect 120 0 121 0;
-#X connect 120 1 122 0;
-#X connect 122 0 123 0;
-#X connect 123 0 124 0;
-#X connect 124 0 121 2;
+#X connect 6 0 46 0;
+#X connect 7 0 8 0;
+#X connect 8 0 138 0;
+#X connect 9 0 26 0;
+#X connect 10 0 25 0;
+#X connect 11 0 8 2;
+#X connect 12 0 8 1;
+#X connect 13 0 12 0;
+#X connect 13 0 11 0;
+#X connect 15 0 8 3;
+#X connect 16 0 8 4;
+#X connect 17 0 68 0;
+#X connect 18 0 69 0;
+#X connect 19 0 70 0;
+#X connect 20 0 71 0;
+#X connect 21 0 10 0;
+#X connect 22 0 9 0;
+#X connect 23 0 35 0;
+#X connect 24 0 36 0;
+#X connect 25 0 6 1;
+#X connect 26 0 6 2;
+#X connect 27 0 56 3;
+#X connect 28 0 15 0;
+#X connect 29 0 58 0;
+#X connect 30 0 59 0;
+#X connect 31 0 16 0;
+#X connect 32 0 61 0;
+#X connect 33 0 60 0;
+#X connect 34 0 6 3;
+#X connect 35 0 45 0;
+#X connect 36 0 64 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 39 0 34 0;
+#X connect 40 0 28 0;
+#X connect 41 0 29 0;
+#X connect 42 0 30 0;
+#X connect 43 0 31 0;
+#X connect 44 0 32 0;
+#X connect 45 0 46 2;
+#X connect 46 0 75 0;
+#X connect 47 0 33 0;
+#X connect 48 0 7 1;
+#X connect 49 0 6 0;
+#X connect 50 0 49 1;
+#X connect 51 0 49 2;
+#X connect 52 0 49 3;
+#X connect 53 0 50 0;
+#X connect 54 0 51 0;
+#X connect 55 0 52 0;
+#X connect 56 0 62 0;
+#X connect 58 0 15 0;
+#X connect 58 1 15 1;
+#X connect 59 0 15 0;
+#X connect 59 1 15 2;
+#X connect 60 0 16 0;
+#X connect 60 1 16 2;
+#X connect 61 0 16 0;
+#X connect 61 1 16 1;
+#X connect 63 0 68 0;
+#X connect 63 0 69 0;
+#X connect 63 0 70 0;
+#X connect 63 0 71 0;
+#X connect 64 0 45 0;
+#X connect 64 1 45 1;
+#X connect 65 0 56 0;
+#X connect 66 0 56 1;
+#X connect 67 0 56 2;
+#X connect 68 0 65 0;
+#X connect 69 0 66 0;
+#X connect 70 0 67 0;
+#X connect 71 0 27 0;
+#X connect 72 0 100 0;
+#X connect 73 0 100 0;
+#X connect 74 0 100 0;
+#X connect 75 0 112 0;
+#X connect 75 0 100 0;
+#X connect 76 0 84 0;
+#X connect 77 0 81 0;
+#X connect 78 0 82 0;
+#X connect 79 0 100 0;
+#X connect 80 0 83 0;
+#X connect 81 0 72 0;
+#X connect 82 0 74 0;
+#X connect 83 0 79 0;
+#X connect 84 0 73 0;
+#X connect 85 0 105 0;
+#X connect 86 0 104 0;
+#X connect 87 0 103 0;
+#X connect 88 0 102 0;
+#X connect 89 0 84 0;
+#X connect 90 0 76 0;
+#X connect 90 0 84 1;
+#X connect 91 0 81 0;
+#X connect 92 0 77 0;
+#X connect 92 0 81 1;
+#X connect 93 0 78 0;
+#X connect 93 0 82 1;
+#X connect 94 0 83 0;
+#X connect 95 0 80 0;
+#X connect 95 0 83 1;
+#X connect 96 0 106 0;
+#X connect 97 0 107 0;
+#X connect 98 0 108 0;
+#X connect 99 0 101 0;
+#X connect 101 0 93 0;
+#X connect 102 0 92 0;
+#X connect 103 0 91 0;
+#X connect 104 0 90 0;
+#X connect 105 0 89 0;
+#X connect 106 0 94 0;
+#X connect 107 0 95 0;
+#X connect 108 0 109 0;
+#X connect 108 0 110 0;
+#X connect 109 0 82 0;
+#X connect 111 0 108 0;
+#X connect 111 0 106 0;
+#X connect 111 0 107 0;
+#X connect 111 0 101 0;
+#X connect 111 0 102 0;
+#X connect 111 0 103 0;
+#X connect 111 0 104 0;
+#X connect 111 0 105 0;
+#X connect 111 0 117 0;
+#X connect 112 0 113 0;
+#X connect 113 0 111 0;
+#X connect 113 0 118 0;
+#X connect 114 0 115 0;
+#X connect 115 0 113 1;
+#X connect 116 0 113 1;
+#X connect 117 0 83 0;
+#X connect 117 0 82 0;
+#X connect 117 0 81 0;
+#X connect 117 0 84 0;
+#X connect 118 0 116 0;
+#X connect 119 0 126 0;
+#X connect 120 0 126 1;
+#X connect 121 0 126 2;
+#X connect 122 0 125 0;
+#X connect 123 0 139 1;
+#X connect 124 0 126 3;
+#X connect 125 0 121 0;
 #X connect 125 0 120 0;
-#X connect 126 0 125 0;
-#X connect 127 0 99 1;
+#X connect 125 0 119 0;
+#X connect 125 0 124 0;
+#X connect 126 0 123 0;
+#X connect 130 0 134 0;
+#X connect 131 0 135 0;
+#X connect 132 0 136 0;
+#X connect 133 0 137 0;
+#X connect 134 0 138 1;
+#X connect 135 0 138 2;
+#X connect 136 0 138 3;
+#X connect 137 0 138 4;
+#X connect 138 0 49 0;
 #X restore 586 -125 pd video_render;
 #N canvas 595 90 769 649 texto 0;
 #X obj 190 -398 gemhead;
@@ -1792,7 +1842,7 @@
 #X obj 397 304 t b;
 #X obj 553 163 s \$0-c22;
 #X obj 620 163 s \$0-c23;
-#X obj 586 -78 outlet;
+#X obj 725 -71 outlet;
 #X obj 601 -370 inlet;
 #N canvas 909 209 450 530 live 0;
 #X obj 53 218 gemhead;
@@ -1864,7 +1914,6 @@
 #X connect 3 0 23 0;
 #X connect 4 0 87 0;
 #X connect 38 0 39 0;
-#X connect 39 0 45 0;
 #X connect 40 0 45 0;
 #X connect 41 0 3 0;
 #X connect 42 0 1 0;
diff --git a/src/PacketCreator.cpp b/src/PacketCreator.cpp
index 8545a86..e611686 100644
--- a/src/PacketCreator.cpp
+++ b/src/PacketCreator.cpp
@@ -239,8 +239,8 @@ unsigned char * PacketCreator::createELINPacket(const QList<MediaLibrary> *media
         memcpy((buffer2 +offset2), &mediai.m_DMXRangeMax,1);
         offset2++;
         const ushort * name = mediai.m_Name.utf16();
-        memcpy((buffer2+offset2), name, (2*mediai.m_Name.size()));
-        offset2 = 2+ offset2 + 2*mediai.m_Name.size();
+        memcpy((buffer2 + offset2), name, (2*mediai.m_Name.size()));
+        offset2 = 2 + offset2 + 2*mediai.m_Name.size();
         memcpy((buffer2+offset2), &mediai.m_ElementCount, 1);
         offset2++;
         memcpy((buffer+offset), buffer2, offset2);
diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp
index c320f5f..1e9ff68 100644
--- a/src/libremediaserver.cpp
+++ b/src/libremediaserver.cpp
@@ -355,7 +355,7 @@ void libreMediaServer::pdstart()
     QString program = "./pd";
     program.append(" -noaudio -lib Gem -stderr -nostdpath -open lms-video.pd");
     if (!m_gui)
-        program.append("-nogui");
+        program.append(" -nogui");
     qDebug() << "PD Video starts with arguments: " << program;
     m_pd_video->setWorkingDirectory("./puredata");
     m_pd_video->start(program);
@@ -616,7 +616,7 @@ void libreMediaServer::stdout() {
     int j = out.indexOf("togui: ",0);
     if ((j >= 0) && (out.size() > (j+7)))
          {
-         int i = m_pathmedia.size() + 16;
+//        int i = m_pathmedia.size() + 16;
          out.remove(0,j);
          switch (out.at(7)) {
              case '0':
diff --git a/src/libremediaserver.h b/src/libremediaserver.h
index 1c6585d..71a9143 100644
--- a/src/libremediaserver.h
+++ b/src/libremediaserver.h
@@ -67,7 +67,7 @@ protected:
     QString m_pathmedia; // Path to Medias
     olaInterface *m_olaInterface;
     QProcess *m_ola; // OLA daemon process
-    QProcess *m_pd_video; // Pure Data process for video
+    QProcess *m_pd_video; // Pure Data process for video engine
 
     // Video Unix Local Sockets
     QLocalServer *m_server_vid;
diff --git a/src/msex.cpp b/src/msex.cpp
index 63b61b7..1dbeb42 100644
--- a/src/msex.cpp
+++ b/src/msex.cpp
@@ -72,8 +72,16 @@ msex::msex(olaInterface *parent)
 
 msex::~msex()
 {
-   if (m_tcpServer)
+   if (m_tcpServer) {
      m_tcpServer->close();
+     m_tcpSocket->waitForDisconnected();
+     delete m_tcpServer;
+   }
+   if (m_tcpSocket) {
+     m_tcpSocket->close();
+     m_tcpSocket->waitForDisconnected();
+     delete m_tcpSocket;
+   }
 }
 
 QString msex::peerName() const