diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/opacity.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/opacity.pd
index 30758bcac82794232bc8b6d35e2f391a7a4c2b7f..96a4d53839c45bed025e87e794f956a52f952a79 100644
--- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/opacity.pd
+++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/opacity.pd
@@ -2,14 +2,11 @@
 #N canvas 0 19 821 586 10;
 #X obj 208 24 struct opacity float x float y;
 #X obj 266 541 loadbang;
-#X msg 266 562 stroke "" \, fill red \, fill-opacity 0.5;
 #X obj 266 583 draw circle 0 60 60;
 #X obj 326 448 loadbang;
 #X obj 326 490 draw circle 0 60 60;
 #X obj 366 357 loadbang;
 #X obj 366 399 draw circle 0 60 60;
-#X msg 326 469 stroke "" \, fill green \, fill-opacity 0.5;
-#X msg 366 378 stroke "" \, fill blue \, fill-opacity 0.5;
 #X obj 251 120 f;
 #X floatatom 278 147 5 0 0 1 speed - -, f 5;
 #X obj 251 192 pack 0 100;
@@ -33,31 +30,34 @@
 #X text 448 79 original screenshot here:;
 #X obj 448 100 pddp/pddplink http://tclbitprint.sourceforge.net/tkpath/quartz/
 ;
-#X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 4 0 8 0;
-#X connect 6 0 9 0;
-#X connect 8 0 5 0;
-#X connect 9 0 7 0;
-#X connect 10 0 25 0;
-#X connect 10 0 26 0;
-#X connect 11 0 26 1;
-#X connect 12 0 14 0;
-#X connect 13 0 12 1;
+#X msg 366 378 fill blue \, fill-opacity 0.5;
+#X msg 326 469 fill green \, fill-opacity 0.5;
+#X msg 266 562 fill red \, fill-opacity 0.5;
+#X connect 1 0 29 0;
+#X connect 3 0 28 0;
+#X connect 5 0 27 0;
+#X connect 7 0 22 0;
+#X connect 7 0 23 0;
+#X connect 8 0 23 1;
+#X connect 9 0 11 0;
+#X connect 10 0 9 1;
+#X connect 11 0 14 0;
+#X connect 11 1 14 1;
+#X connect 11 2 13 0;
+#X connect 11 3 13 1;
+#X connect 11 4 12 0;
+#X connect 11 5 12 1;
+#X connect 12 0 15 0;
+#X connect 13 0 16 0;
 #X connect 14 0 17 0;
-#X connect 14 1 17 1;
-#X connect 14 2 16 0;
-#X connect 14 3 16 1;
-#X connect 14 4 15 0;
-#X connect 14 5 15 1;
-#X connect 15 0 18 0;
-#X connect 16 0 19 0;
-#X connect 17 0 20 0;
-#X connect 18 0 7 0;
-#X connect 19 0 5 0;
-#X connect 20 0 3 0;
-#X connect 22 0 26 0;
-#X connect 23 0 10 0;
-#X connect 24 0 23 0;
-#X connect 25 0 10 1;
-#X connect 26 0 12 0;
+#X connect 15 0 6 0;
+#X connect 16 0 4 0;
+#X connect 17 0 2 0;
+#X connect 19 0 23 0;
+#X connect 20 0 7 0;
+#X connect 21 0 20 0;
+#X connect 22 0 7 1;
+#X connect 23 0 9 0;
+#X connect 27 0 6 0;
+#X connect 28 0 4 0;
+#X connect 29 0 2 0;
diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd
index 9ed8b19c7f0e35783a876fe1688639bed86795fa..fdd7697f56d6c4e2278635efe4e1459b8e80a2a3 100644
--- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd
+++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd
@@ -2,7 +2,7 @@
 y3 float y4 float y5 float y6;
 #N struct hotspot float x float y float radius;
 #N canvas 0 19 619 390 10;
-#X scalar quick-graph 30 105 99 89 83 57 79 61 32 \;;
+#X scalar quick-graph 30 105 99 89 83 72 56 63 32 \;;
 #X msg 243 97 fill blue \, stroke blue \, stroke-width 2 \, fill-opacity
 0.6;
 #X obj 24 33 struct quick-graph float x float y float y0 float y1 float
@@ -12,7 +12,6 @@ y2 float y3 float y4 float y5 float y6;
 #X obj 131 53 route enter change leave;
 #X obj 131 159 loadbang;
 #X obj 268 118 loadbang;
-#X msg 268 139 fill "";
 #X obj 131 29 struct hotspot float x float y float radius;
 #X msg 131 184 fill blue \, stroke blue \, fill-opacity 0.6 \, mousedown
 1 \, drag 1;
@@ -39,44 +38,45 @@ y2 float y3 float y4 float y5 float y6;
 #X obj 327 341 - 95;
 #X obj 241 541 set;
 #X msg 241 482 set quick-graph y\$1 \, \$2;
-#X connect 0 0 11 0;
-#X connect 0 2 8 0;
-#X connect 1 0 5 0;
-#X connect 2 0 3 0;
-#X connect 3 0 6 0;
-#X connect 4 0 0 0;
-#X connect 5 0 7 0;
-#X connect 7 0 12 0;
-#X connect 8 0 9 0;
-#X connect 11 0 10 0;
-#X connect 12 0 13 0;
+#X msg 268 139 fill none;
+#X connect 0 0 10 0;
+#X connect 0 2 7 0;
+#X connect 1 0 4 0;
+#X connect 2 0 28 0;
+#X connect 3 0 0 0;
+#X connect 4 0 6 0;
+#X connect 6 0 11 0;
+#X connect 7 0 8 0;
+#X connect 10 0 9 0;
+#X connect 11 0 12 0;
+#X connect 12 0 16 0;
+#X connect 12 1 13 0;
+#X connect 13 0 14 1;
 #X connect 13 0 17 0;
-#X connect 13 1 14 0;
-#X connect 14 0 15 1;
-#X connect 14 0 18 0;
+#X connect 15 0 14 0;
 #X connect 16 0 15 0;
-#X connect 17 0 16 0;
-#X connect 18 0 21 0;
-#X connect 18 1 16 1;
-#X connect 18 1 26 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 19 0;
-#X connect 21 1 22 0;
-#X connect 22 0 23 0;
-#X connect 23 0 27 1;
-#X connect 23 1 24 0;
-#X connect 24 0 23 0;
-#X connect 25 0 28 0;
-#X connect 26 0 25 1;
-#X connect 28 0 27 0;
+#X connect 17 0 20 0;
+#X connect 17 1 15 1;
+#X connect 17 1 25 0;
+#X connect 18 0 19 0;
+#X connect 19 0 24 0;
+#X connect 20 0 18 0;
+#X connect 20 1 21 0;
+#X connect 21 0 22 0;
+#X connect 22 0 26 1;
+#X connect 22 1 23 0;
+#X connect 23 0 22 0;
+#X connect 24 0 27 0;
+#X connect 25 0 24 1;
+#X connect 27 0 26 0;
+#X connect 28 0 5 0;
 #X restore 243 174 pd hotspot;
 #X scalar hotspot 30 194 4 \;;
 #X scalar hotspot 50 185 4 \;;
 #X scalar hotspot 70 178 4 \;;
-#X scalar hotspot 90 152 4 \;;
-#X scalar hotspot 110 173 4 \;;
-#X scalar hotspot 130 156 4 \;;
+#X scalar hotspot 90 167 4 \;;
+#X scalar hotspot 110 152 4 \;;
+#X scalar hotspot 130 159 4 \;;
 #X scalar hotspot 150 127 4 \;;
 #X text 241 217 Quick graph demo showing some mouseover animation.
 ;
diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/spin-spin-spin.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/spin-spin-spin.pd
index 2707ef342a54ef07d0ffbf3cf2c4573a1df5fddf..0c9f1028d97c45bec2c1b013776cebe323e41287 100644
--- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/spin-spin-spin.pd
+++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/spin-spin-spin.pd
@@ -112,9 +112,9 @@ stroke-opacity 0.6 \, rx 30 \, ry 30;
 #X connect 50 0 51 0;
 #X connect 51 0 52 0;
 #X connect 52 0 0 0;
-#X restore 104 64 pd render;
+#X restore 14 4 pd render;
 #X scalar leaf 1000 1000 \;;
-#X obj 528 399 bng 56 250 50 0 empty empty empty 17 7 0 10 -262144
+#X obj 438 339 bng 56 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #N canvas 856 281 450 384 make-sound 0;
 #X msg 286 73 traverse spinner \, next;
@@ -161,19 +161,19 @@ stroke-opacity 0.6 \, rx 30 \, ry 30;
 #X connect 19 0 11 0;
 #X connect 19 0 20 0;
 #X connect 20 0 14 0;
-#X restore 528 460 pd make-sound;
-#X obj 104 87 namecanvas spinner;
-#X obj 528 501 output~;
-#X text 343 116 Waiting for Godot;
-#X text 343 116 _________________;
-#X text 343 136 This is another demo inspired by a Raphael.js demo.
+#X restore 438 400 pd make-sound;
+#X obj 14 27 namecanvas spinner;
+#X obj 438 441 output~;
+#X text 253 56 Waiting for Godot;
+#X text 253 56 _________________;
+#X text 253 76 This is another demo inspired by a Raphael.js demo.
 It's just the little spinner that's all the rave in HTML5 interfaces.
 ;
-#X text 343 236 Additionally \, I did the animation with "struct-wide"
+#X text 253 176 Additionally \, I did the animation with "struct-wide"
 changes to the drawing instructions. You can also use a separate scalar
 for each pedal of the spinner flower \, but then you lose the ability
 to move it as one entity.;
-#X text 343 176 Notice \, however \, that in Pd the concept is as absurd
+#X text 253 116 Notice \, however \, that in Pd the concept is as absurd
 as this example demo. Pd's control diagrams are deterministic \, so
 unless you actually schedule time for the spinner to spin-- as I do
 here-- you'll never actually get any animation.;
diff --git a/pd/nw/todo.txt b/pd/nw/todo.txt
index 925371590613ad8eaa8228fe8788380bf4321901..627096d0f195f2a6f78fe6b44351ad6148e669e5 100644
--- a/pd/nw/todo.txt
+++ b/pd/nw/todo.txt
@@ -201,6 +201,8 @@ Everything else: (A [x] means we've fixed it)
     in the lib loading routine
 [ ] Fix layout on dialogs so that height/width of the document doesn't
     reflow when the window gets resized
+[ ] ds-demos unit-circle node throws an "unexpected string" error when
+    trying to open it
 
 Crashers
 --------