diff --git a/Ch 8 Object Modeling/Ch8codefigures1.scd b/Ch 8 Object Modeling/Ch8codefigures1.scd
index 6bec58d..8a95003 100644
--- a/Ch 8 Object Modeling/Ch8codefigures1.scd	
+++ b/Ch 8 Object Modeling/Ch8codefigures1.scd	
@@ -1,16 +1,16 @@
 
-/////////////////////// Object Modeling code figures /////////////////// 
+/////////////////////// Object Modeling code figures ///////////////////
 
 
 
 	//	figure 8.1 - a Puppet class, and tests for it.
-	
-Puppet { 
+
+Puppet {
 	var <>myfreq; // an instance variable with a getter and a setter method
-	
+
 		// a method for creating a new object of this kind
 	*new { |myfreq=50| ^super.new.myfreq_(myfreq) }
-	
+
 		// a simple method that uses 'myfreq' for something audible.
 	blip { { Blip.ar(myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play; }
 }
@@ -35,7 +35,7 @@ m.blip;		 // should sound differently
 m = (); 			// make an empty event
 m.myfreq_(50);	// put something in it with a setter method: a pseudo-instance variable
 m.myfreq;			// look it up with a getter method
-				// put a function into it with a setter: 
+				// put a function into it with a setter:
 				// this becomes a pseudo-method
 m.blip_({ |ev| { Blip.ar(ev.myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play; });
 m.blip;		// execute the function with a pseudo-method call (same name)
@@ -49,9 +49,9 @@ m.blip;		// execute the function with a pseudo-method call (same name)
 m.numHarms_(20); 	// a new instvar
 m.decay_(0.3); 	// and another
 				// update the blip method to use them:
-m.blip_({ |ev| 
-	{ Blip.ar(ev.myfreq, ev.numHarms) 
-	* XLine.kr(1, 0.01, ev.decay, doneAction: 2) }.play; 
+m.blip_({ |ev|
+	{ Blip.ar(ev.myfreq, ev.numHarms)
+	* XLine.kr(1, 0.01, ev.decay, doneAction: 2) }.play;
 });
 )
 m.blip;	// test
@@ -83,8 +83,8 @@ z.win.close;	// close when done
 (
 z.makeWin = { |z, message="Shout this!"|
 	z.win = Window("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = TextView(z.win, Rect(0, 0,1200, 100));
@@ -93,8 +93,8 @@ z.makeWin = { |z, message="Shout this!"|
 	z.txtView.background_(Color.clear);
 };
 )
-z.makeWin; 
-z.makeWin("Try showing that."); 
+z.makeWin;
+z.makeWin("Try showing that.");
 
 
 
@@ -124,17 +124,17 @@ z.shout("Do we get this too?"); // also when window has closed?
 
 z.txtView.stringColor_(Color.red);	// try a single color
 (
-z.animate = { |z, dt=0.2, n = 6| 
+z.animate = { |z, dt=0.2, n = 6|
 	var colors = [Color.red, Color.green, Color.black];
-	Task { 
-		n.do { |i|Ê
-			dt.wait; 
+	Task {
+		n.do { |i|
+			dt.wait;
 			z.txtView.stringColor_(colors.wrapAt(i))
 		}
 	}.play(AppClock)
 };
 )
-z.animate;			// test with default values 
+z.animate;			// test with default values
 z.animate(0.1, 24); 	// and test with arguments given
 
 
@@ -147,7 +147,7 @@ z.animate(0.1, 24); 	// and test with arguments given
 
 
 
-	// figure 8.9 - using codeDump to shout 
+	// figure 8.9 - using codeDump to shout
 
 this.codeDump = { |str, result, func| [str, result, func].printAll };
 
@@ -164,22 +164,22 @@ this.codeDump = { |str| if (str.beginsWith(z.shoutTag)) { z.shout(str.drop(z.sho
 
 	//	figure 8.10 - updated setMessage flashes text.
 (
-z.setMessage = { |z, str| 
-	var messSize = str.size; 
+z.setMessage = { |z, str|
+	var messSize = str.size;
 	var fontsize = (1.64 * z.txtView.bounds.width) / max(messSize, 32);
 	z.txtView.font_(GUI.font.new("Monaco", fontsize));
 	z.txtView.string_(str);
 	z.animate;
 };
 )
-//!! a long comment gets scaled down to a rather smaller font size, minimally fontsize 32! 
+//!! a long comment gets scaled down to a rather smaller font size, minimally fontsize 32!
 
 //!! short is big!
 (
 z.makeWin = { |q, message="Shout this!"|
 	z.win = Window("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = TextView(z.win, Rect(0, 0,1200, 100));
@@ -200,16 +200,16 @@ z.makeWin("shout.");
 Shout {
 	classvar <>tag="//!!";
 	var <win, <txtView;
-	
+
 	*new { ^super.new }
-} 
+}
 // end of file - Shout.sc
 
-// tests: 
+// tests:
 Shout.tag;
 Shout.tag_("//SHOUT");
 
-a = Shout.new; 
+a = Shout.new;
 a.win;
 a.txtView;
 
@@ -220,14 +220,14 @@ a.txtView;
 
 // begin of file - Shout.sc
 Shout {
-	classvar <>tag="//!!", <>width=1250, <>defaultCodeDumpFunc; 
+	classvar <>tag="//!!", <>width=1250, <>defaultCodeDumpFunc;
 	var <win, <txtView;
-	
-	*initClass { 
+
+	*initClass {
 		defaultCodeDumpFunc = { |str| if (str.beginsWith(tag)) { Shout(str.drop(tag.size)) } };
 	}
 	*new { ^super.new }
-} 
+}
 // end of Shout.sc
 
 Shout.width;
@@ -240,8 +240,8 @@ Shout.defaultCodeDumpFunc;
 
 z.makeWin = { |message="Shout this!"|
 	z.win = GUI.window.new("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = GUI.textView.new(z.win, Rect(0, 0,1200, 100));
@@ -250,24 +250,24 @@ z.makeWin = { |message="Shout this!"|
 };
 
 
-Shout {	
+Shout {
 	...
 	*new { |message| ^super.new.makeWin(message); }
-	
-	makeWin { |message="Shout this!"| 
-	
+
+	makeWin { |message="Shout this!"|
+
 		win = Window("Shout'er", Rect(20, 800, width, 80)).front;
 		win.alpha_(0.7);
 		win.view.background_(Color.clear);
 		win.alwaysOnTop_(true);
-		
+
 		txtView = TextView(win, win.bounds.moveTo(0,0));
 		txtView.background_(Color.clear);
 		txtView.font_(Font.new("Monaco", 32));
 		this.setMessage(message);
 	}
 
-	setMessage { |message| 
+	setMessage { |message|
 		txtView.string_(message.asString)
 	}
 }
@@ -289,26 +289,26 @@ z.shout = { |z, str|
 	z.setMessage(str);
 };
 
-Shout { 
+Shout {
 	classvar <top;
 	...
-	*new { |message="ÁShout'er!"| 
+	*new { |message="Shout'er!"|
 
-		if (top.isNil or: { top.win.isClosed }) { 
-			top = this.basicNew(message); 
+		if (top.isNil or: { top.win.isClosed }) {
+			top = this.basicNew(message);
 		} {
 			top.setMessage(message);
 		};
 	}
 		// the method formerly known as *new
-	*basicNew { |message="Shout this!"| ^super.new.makeWin(message) } 
+	*basicNew { |message="Shout this!"| ^super.new.makeWin(message) }
 
 	*close { try { top.win.close } }
-	
+
 	...
 }
 
-// tests: 
+// tests:
 Shout("Test 1, 2");
 Shout("Test 1, 2, 3, 4");	// same window
 Shout.close;
@@ -322,32 +322,32 @@ Shout("Test 1, 2");		// new window
 
 	//	figure 8.15 - converting animate to a class method.
 
-z.animate = { |z, dt=0.2, n = 6| 
+z.animate = { |z, dt=0.2, n = 6|
 	var colors = [Color.red, Color.green, Color.black];
-	Task { 
-		n.do { |i|Ê
-			dt.wait; 
+	Task {
+		n.do { |i|
+			dt.wait;
 			z.txtView.stringColor_(colors.wrapAt(i))
 		}
 	}.play(AppClock)
 };
 
-Shout { 
+Shout {
 	...
 	animate { |dt=0.2, n=6|
-		var colors = [Color.red, Color.green, Color.black]; 
-		Task { 
-			n.do { |i| 
-				txtView.stringColor_(colors.wrapAt(i)); 
-				dt.wait 
+		var colors = [Color.red, Color.green, Color.black];
+		Task {
+			n.do { |i|
+				txtView.stringColor_(colors.wrapAt(i));
+				dt.wait
 			};
 			txtView.stringColor_(Color.black); // make sure we end black
 		}.play(AppClock);
 	}
-	...	
+	...
 }
 
-// tests: 
+// tests:
 a = Shout("Test 1, 2");
 Shout.top.animate;
 
@@ -355,31 +355,31 @@ Shout.top.animate;
 
 
 
- 
+
 	// figure 8.16 - converting setMessage
 
-z.setMessage = { |z, str| 
-	var messSize = str.size; 
+z.setMessage = { |z, str|
+	var messSize = str.size;
 	var fontsize = (1.64 * z.txtView.bounds.width) / max(messSize, 32);
 	z.txtView.font_(GUI.font.new("Monaco", fontsize));
 	z.txtView.string_(str);
 	z.animate;
 };
 
-Shout { 
+Shout {
 	...
-	setMessage { |message| 
+	setMessage { |message|
 		var messSize, fontSize;
 		messSize = message.size;
 		fontSize = (1.64 * width) / max(messSize, 32);
-		
-		defer { 
+
+		defer {
 			txtView.font_(Font("Monaco", fontSize))
 				.string_(message.asString);
 		};
 		this.animate;
 	}
-	...	
+	...
 }
 
 Shout("Test 1, 2");
@@ -402,18 +402,18 @@ this.codeDump.postcs	// should be gone now
 
 //!! should be off again
 
-Shout { 
+Shout {
 	...
-	*add { var interp = thisProcess.interpreter; 
+	*add { var interp = thisProcess.interpreter;
 		interp.codeDump = interp.codeDump
-			.removeFunc(defaultCodeDumpFunc) // remove it first so it will 
+			.removeFunc(defaultCodeDumpFunc) // remove it first so it will
 										// only be in the list once
-			.addFunc(defaultCodeDumpFunc); 
+			.addFunc(defaultCodeDumpFunc);
 	}
-	*remove { var interp = thisProcess.interpreter; 
-		interp.codeDump = interp.codeDump.removeFunc(defaultCodeDumpFunc); 
+	*remove { var interp = thisProcess.interpreter;
+		interp.codeDump = interp.codeDump.removeFunc(defaultCodeDumpFunc);
 	}
-	...	
+	...
 }
 
 // tests
@@ -433,28 +433,28 @@ Shout.close;
 Shout("blabla");	// now typing is impossible, because the new window is in front.
 
 Shout("blabla blabla");	// now one can type, because Shout window was already there.
-Shout.close; 
+Shout.close;
 
 	// this does not work, because the shout window gets put in front later:
-d = Document.current; Shout(\bla); d.front; 
- 
+d = Document.current; Shout(\bla); d.front;
+
 
 	// This can be wrapped around the call to this.makeWin in Shout:new:
-Shout { 
+Shout {
 	...
-	*new { |message="ÁShout'er!"| 
+	*new { |message="Shout'er!"|
 		var currDoc;
 
-		if (win.isNil or: { win.isClosed }) { 
+		if (win.isNil or: { win.isClosed }) {
 			currDoc = Document.current;
-			top = this.basicNew(message); 
+			top = this.basicNew(message);
 				// wait a little before restoring front window
 			defer ({ currDoc.front }, 0.1);
 		} {
 			top.setMessage(message);
 		};
 	}
-	...	
+	...
 }
 
 
@@ -468,8 +468,8 @@ serialize {|index, pos, extent = 8|
 	var ranges, slice;
 
 	// get ranges
-	ranges = pos.collect{|pos, i| 
-		((pos-(extent*0.5))..(pos+(extent*0.5)-1)) % this.shape[i] 
+	ranges = pos.collect{|pos, i|
+		((pos-(extent*0.5))..(pos+(extent*0.5)-1)) % this.shape[i]
 	};
 	// get sub-slice
 	slice = this.slice(index, *ranges);
@@ -497,7 +497,7 @@ serialize {|index, pos, extent = 8, how = \hilbert|
 
 
 
-// figure 8.21 Ñ some initial serialization methods, and adding an alternative. 
+// figure 8.21  some initial serialization methods, and adding an alternative.
 
 	*initClass {|numDims = 4|
 		...
@@ -524,12 +524,12 @@ QCD.serTypes.put(\star, {|slice|
 	var numDims = 4;
 	var starShape;
 
-	starShape = neighbours1.collect({ |nb|  
-		(0..starSize).collect(_ * nb) 
-	}).flatten(1).collect {|indexN| 
-		indexN + (starSize.div(2)+1).dup(numDims) 
+	starShape = neighbours1.collect({ |nb|
+		(0..starSize).collect(_ * nb)
+	}).flatten(1).collect {|indexN|
+		indexN + (starSize.div(2)+1).dup(numDims)
 	};
-	
+
 	starShape.collect{|iA| slice.slice(*iA)}
 });
 
@@ -537,6 +537,6 @@ QCD.serTypes.put(\star, {|slice|
 
 
 
-///////// continued in ObjMod2_codefigures.rtf ///// 
+///////// continued in ObjMod2_codefigures.rtf /////
 
 
diff --git a/Ch 8 Object Modeling/Ch8codefigures2.scd b/Ch 8 Object Modeling/Ch8codefigures2.scd
index 37728a8..f9dbe15 100644
--- a/Ch 8 Object Modeling/Ch8codefigures2.scd	
+++ b/Ch 8 Object Modeling/Ch8codefigures2.scd	
@@ -3,25 +3,26 @@
 	// figure 8.23 - two granular synthdefs and tests
 (
 	// a gabor (approx. gaussian-shaped) grain
-SynthDef(\gab1st, { |out, amp=0.1, freq=440, sustain=0.01, pan| 
+SynthDef(\gab1st, { |out, amp=0.1, freq=440, sustain=0.01, width = 0.3, pan|
 	var snd = FSinOsc.ar(freq);
-	var env = EnvGen.ar(Env.sine(sustain, amp * AmpComp.ir(freq) * 0.5), doneAction: 2);
+	var env = LFGauss.ar(sustain, width, loop: 0, doneAction: 2).range;
+	snd = snd * amp * AmpComp.ir(freq) * 0.5;
 	OffsetOut.ar(out, Pan2.ar(snd * env, pan));
-}, \ir ! 5).memStore;
+}, \ir ! 5).add;
 
 
 			// a simple percussive envelope
-SynthDef(\percSin, { |out, amp=0.1, freq=440, sustain=0.01, pan| 
+SynthDef(\percSin, { |out, amp=0.1, freq=440, sustain=0.01, pan|
 	var snd = FSinOsc.ar(freq);
 	var env = EnvGen.ar(
-		Env.perc(0.1, 0.9, amp * AmpComp.ir(freq) * 0.5), 
+		Env.perc(0.1, 0.9, amp * AmpComp.ir(freq) * 0.5),
 			timeScale: sustain, doneAction: 2
 		);
 	OffsetOut.ar(out, Pan2.ar(snd * env, pan));
-}, \ir ! 5).memStore;
+}, \ir ! 5).add;
 
 
-/*	
+/*
 	// tests for the synthdefs:
 Synth(\gab1st);
 Synth(\percSin);
@@ -36,11 +37,11 @@ Synth(\gab1st, [\out, 0, \amp, 0.2, \freq, 2000, \sustain, 0.05, \pan, 0.5] );
 
 	// figure 8.24 - global setup and a player Tdef for the cloud.
 (
-q = q ? (); 
+q = q ? ();
 
 	// some globals
-q.paramRNames = [\freqRange, \durRange, \densRange, \ampRange, \panRange]; 
-q.paramNames = [\freq, \grDur, \dens, \amp, \pan]; 
+q.paramRNames = [\freqRange, \durRange, \densRange, \ampRange, \panRange];
+q.paramNames = [\freq, \grDur, \dens, \amp, \pan];
 q.syndefNames = [\gab1st, \gabWide, \percSin, \percSinRev, \percNoise];
 
 	// specs for some parameters
@@ -49,7 +50,7 @@ Spec.add(\ring, [0.03, 30, \exp]);
 Spec.add(\grDur, [0.0001, 1, \exp]);
 Spec.add(\dens, [1, 1000, \exp]);
 
-	// make an empty tdef that plays it, 
+	// make an empty tdef that plays it,
 	// and put the cloud parameter ranges in the tdef's environment
 Tdef(\cloud0)
 	.set(
@@ -58,28 +59,30 @@ Tdef(\cloud0)
 	\current, (
 		freqRange: [200, 2000],
 		ampRange: [0.1, 1],
-		durRange: [0.001, 0.01], 
+		durRange: [0.001, 0.01],
 		densRange: [1, 1000],
-		panRange: [-1.0, 1.0] 
+		widthRange: [0.1, 0.3],
+		panRange: [-1.0, 1.0]
 	)
-); 
-		
-		// make the tdef that plays the cloud of sound particles here, 
+);
+
+		// make the tdef that plays the cloud of sound particles here,
 		// based on parameter range settings.
-Tdef(\cloud0, { |e| 
+Tdef(\cloud0, { |e|
 
 	loop {
 		s.sendBundle(s.latency, [
-			"/s_new", e.synName ? \gab1st, 
+			"/s_new", e.synName ? \gab1st,
 			-1, 0, 0,
 			\freq, 	exprand(e.current.freqRange[0], e.current.freqRange[1]),
+			\width, exprand(e.current.widthRange[0], e.current.widthRange[1]),
 			\amp,	exprand(e.current.ampRange[0], e.current.ampRange[1]) * e.vol,
 			\sustain,	exprand(e.current.durRange[0], e.current.durRange[1]),
 			\pan, 	rrand(e.current.panRange[0], e.current.panRange[1])
 		]);
-		exprand(e.current.densRange[0].reciprocal, e.current.densRange[1].reciprocal).wait; 
+		exprand(e.current.densRange[0].reciprocal, e.current.densRange[1].reciprocal).wait;
 	}
-}).quant_(0);	
+}).quant_(0);
 );
 
 
@@ -87,11 +90,11 @@ Tdef(\cloud0, { |e|
 
 
 	// figure  8.25	-  tests for the cloud
-	
+
 Tdef(\cloud0).play;
 
-	// try changing various things from outside the loop. 
-	// change its playing settings 
+	// try changing various things from outside the loop.
+	// change its playing settings
 
 Tdef(\cloud0).envir.current.put('densRange', [ 50, 200 ]); // dense, async
 Tdef(\cloud0).envir.current.put('densRange', [ 1, 10 ]);  // sparse, async
@@ -101,6 +104,7 @@ Tdef(\cloud0).envir.current.put('densRange', [ 30, 30 ]); // synchronous
 d = Tdef(\cloud0).envir;
 d.current.put('freqRange', [ 800, 1200 ]);
 d.current.put('durRange', [ 0.02, 0.02 ]);
+d.current.put('durRange', [ 0.001, 0.08 ]);
 
 d.current.put('ampRange', [ 0.1, 0.1 ]);
 
@@ -108,14 +112,10 @@ d.current.put('panRange', [ 1.0, 1.0 ]);
 d.current.put('panRange', [ -1.0, 1.0 ]);
 
 d.current.put('densRange', [ 30, 60 ]);
+d.current.put('widthRange', [ 0.001, 0.7 ]);
+
 d.synName = \percSin;
 d.synName = \gab1st;
-d.synName = \gabWide;
-d.synName = \percSinRev;
-d.synName = \percNoise;
-d.synName = \percSinRev;
-d.synName = \gab1st;
-d.current.put('durRange', [ 0.001, 0.08 ]);
 
 
 
@@ -128,28 +128,28 @@ d.current.put('durRange', [ 0.001, 0.08 ]);
 	// make the Tdef's envir a global variable for easier experimenting
 d = Tdef(\cloud0).envir;
 	// a pseudo-method to make random settings, kept in the Tdef's environment
-		// randomize could also do limited variation on existing setting. 
+		// randomize could also do limited variation on existing setting.
 d.randSet = { |d|
-	var randSet = ();	
-	q.paramRNames.do { |pName, i| 
-		randSet.put(pName, 
+	var randSet = ();
+	q.paramRNames.do { |pName, i|
+		randSet.put(pName,
 			q.paramNames[i].asSpec.map([1.0.rand, 1.0.rand].sort)
 		);
 	};
 	randSet;
 };
 
-/* 	test randSet: 
+/* 	test randSet:
 d.current = d.randSet;
 */
 
-// make 8 sets of parameter range settings: 
+// make 8 sets of parameter range settings:
 d.setNames = (1..8).collect { |i| ("set" ++ i).asSymbol };
 d.setNames.do { |key| d[key] = d.randSet; }
 
 /*	test switching to the random presets
 d.current = d.set1.copy;	// copy to avoid writing into a stored setting when it is current.
-d.current = d.set3.copy;	
+d.current = d.set3.copy;
 d.current = d.set8.copy;
 */
 );
@@ -158,24 +158,24 @@ d.current = d.set8.copy;
 
 
 	// ex. 8.27 - crossfading between different settings with a taskproxy
-	
+
 (
 	// and some parameters for controlling the fade
 d.stopAfterFade = false;
-d.xfadeTime = 5; 
+d.xfadeTime = 5;
 
 d.morphtask = TaskProxy({
 	var startSet = d[\current], endSet = d[\target];
 	var stepsPerSec = 20;
 	var numSteps = d.xfadeTime * stepsPerSec;
 	var blendVal, morphSettings;
-	
-	if (d.target.notNil) { 
-		(numSteps).do { |i| 
+
+	if (d.target.notNil) {
+		(numSteps).do { |i|
 		//	["numSteps", i].postln;
-			blendVal = (i + 1) / numSteps; 
-			morphSettings = endSet.collect({ |val, key| 
-				(startSet[key] ? val).blend(val, blendVal) 
+			blendVal = (i + 1) / numSteps;
+			morphSettings = endSet.collect({ |val, key|
+				(startSet[key] ? val).blend(val, blendVal)
 			});
 			d.current_(morphSettings);
 			(1/stepsPerSec).wait;
@@ -194,7 +194,7 @@ d.morphtask.play;
 )
 Tdef(\cloud0).stop;
 
-	// playing a finite cloud with tendency mask: 
+	// playing a finite cloud with tendency mask:
 (
 Tdef(\cloud0).play;		// begin playing
 d.stopAfterFade = true; 	// end cloud when crossfade ends
@@ -205,9 +205,9 @@ d.morphtask.play;			// and start crossfade.
 */
 
 	// put fading into its own method, with optional stop.
-d.fadeTo = { |d, start, end, time, autoStop| 
+d.fadeTo = { |d, start, end, time, autoStop|
 	d.current = d[start] ? d.current;
-	d.target = d[end]; 
+	d.target = d[end];
 	d.xfadeTime = time ? d.xfadeTime;
 	if (autoStop.notNil) { d.stopAfterFade = autoStop };
 	d.morphtask.stop.play;
@@ -221,7 +221,7 @@ d.fadeTo(\current, \set5, 3, true);
 
 Tdef(\cloud0).play;
 d.fadeTo(\current, \set1, 3, false);
-*/ 
+*/
 );
 
 
@@ -231,110 +231,110 @@ d.fadeTo(\current, \set1, 3, false);
 
 
 
-	// figure 8.29 - a lightweight graphical user interface for CloudGenMini 
+	// figure 8.29 - a lightweight graphical user interface for CloudGenMini
 (
-q.makeCloudGui = { |q, tdef, posPoint| 
-	var w, ezRangers, fdBox; 
-	var setMinis, skipjack; 
-	
+q.makeCloudGui = { |q, tdef, posPoint|
+	var w, ezRangers, fdBox;
+	var setMinis, skipjack;
+
 	posPoint = posPoint ? 400@400;	// where to put the gui window
-	
-	w = Window.new("CloudGen_mini_sc3", 
+
+	w = Window.new("CloudGen_mini_sc3",
 		Rect.fromPoints(posPoint, (posPoint + (400@300)))).front;
 	w.view.decorator_(FlowLayout(w.bounds.copy.moveTo(0, 0)));
-		
-	w.view.decorator.nextLine; 
+
+	w.view.decorator.nextLine;
 		// the range sliders display the current values
 	ezRangers = ();
-	
-	q.paramRNames.do { |name, i| 
-		ezRangers.put(name, 
-		EZRanger(w, 400@20, name, q.paramNames[i], 
-			{ |sl| tdef.envir.current[name] = sl.value; }, 
+
+	q.paramRNames.do { |name, i|
+		ezRangers.put(name,
+		EZRanger(w, 400@20, name, q.paramNames[i],
+			{ |sl| tdef.envir.current[name] = sl.value; },
 			tdef.envir.current[name], labelWidth: 70, numberWidth: 50, unitWidth: 10)
 			.round_([0.1, 0.00001, 0.0001, 0.0001, 0.01][i])
 		);
 	};
 		// a just in time - gui for the Tdef
-	TdefEditor(tdef, height: 20, w: w); 
-	
+	TdefGui(tdef, parent: w);
+
 	Button.new(w, 80@20).states_([[\randomize]])
-		.action_({ 
+		.action_({
 			tdef.envir.target_(d.randSet);
 			tdef.envir.morphtask.stop.play;
 		});
-	
-	fdBox = EZNumber.new(w, 110@20, \xFadeTime, [0, 100, \amp], 
-		{ |nbx| tdef.envir.xfadeTime = nbx.value }, 
-		 tdef.envir.xfadeTime, false, 65); 
+
+	fdBox = EZNumber.new(w, 110@20, \xFadeTime, [0, 100, \amp],
+		{ |nbx| tdef.envir.xfadeTime = nbx.value },
+		 tdef.envir.xfadeTime, false, 65);
 
 			// skipjack is a task that survives cmd-period:
 			// used here for lazy-updating the control views.
-	skipjack = SkipJack({  
+	skipjack = SkipJack({
 		q.paramRNames.do { |name| ezRangers[name].value_(tdef.envir.current[name]) };
-		fdBox.value_(tdef.envir.xfadeTime); 
-		
-		// mark last settings that were used by color? 
-		// a separate color when changed? 
-		
+		fdBox.value_(tdef.envir.xfadeTime);
+
+		// mark last settings that were used by color?
+		// a separate color when changed?
+
 	}, 0.5, { w.isClosed }, name: tdef.key);
-	
+
 	w.view.decorator.nextLine;
 
-	// make a new layoutView for the 8 presets; 
-	// put button to switch to that preset, 
-	// a button to save current settings to that place, 
+	// make a new layoutView for the 8 presets;
+	// put button to switch to that preset,
+	// a button to save current settings to that place,
 	// and a miniview of the settings as a visual reminder in it.
-	
+
 		// make 8 setButtons
-	tdef.envir.setNames.do { |setname, i|	
+	tdef.envir.setNames.do { |setname, i|
 		var minisliders, setMinis;
 		var zone = CompositeView.new(w, Rect(0,0,45, 84));
-		zone.decorator = FlowLayout(zone.bounds, 0@0, 5@0); 
-		zone.background_(Color.white); 
-		
+		zone.decorator = FlowLayout(zone.bounds, 0@0, 5@0);
+		zone.background_(Color.white);
+
 		Button.new(zone, Rect(0,0,45,20)).states_([[setname]])
-			.action_({ 
-				// just switch: // tdef.envir.current.putAll(d[setname] ? ()) 
+			.action_({
+				// just switch: // tdef.envir.current.putAll(d[setname] ? ())
 				tdef.envir.target = tdef.envir[setname];
 				tdef.envir.morphtask.stop.play;
 			});
-		
+
 		Button.new(zone, Rect(0,0,45,20))
 			.states_([["save" ++ (i + 1)]])
-			.action_({ 
-				d[setname] = tdef.envir.current.copy; 
+			.action_({
+				d[setname] = tdef.envir.current.copy;
 				setMinis.value;
 			});
-		
-		minisliders = q.paramRNames.collect { |paramRname| 
+
+		minisliders = q.paramRNames.collect { |paramRname|
 			RangeSlider.new(zone, 45@8).enabled_(false);
 		};
-		setMinis = { 
-			q.paramRNames.do { |paramRname, i| 
+		setMinis = {
+			q.paramRNames.do { |paramRname, i|
 				var paramName = q.paramNames[i];
 				var myrange = d[setname][paramRname];
-				var unmapped = paramName.asSpec.unmap(myrange); 
+				var unmapped = paramName.asSpec.unmap(myrange);
 				minisliders[i].lo_(unmapped[0]).hi_(unmapped[1]);
-			} 
+			}
 		};
 		setMinis.value;
 	};
 
-/* 	Some extras: 
-	a volume slider for simple mixing, 
-	a popup menu for switching syndefnames; 
-	a button to stop/start the skipjack for refreshing, 
+/* 	Some extras:
+	a volume slider for simple mixing,
+	a popup menu for switching syndefnames;
+	a button to stop/start the skipjack for refreshing,
 	so one can use numberboxes to enter values.
 */
-	EZSlider(w, 245@20, "vol", \amp, { |sl|tdef.set(\vol, sl.value) }, 
+	EZSlider(w, 245@20, "vol", \amp, { |sl|tdef.set(\vol, sl.value) },
 		0.25, false, 20, 36);
 
-	StaticText.new(w, 55@20).string_("synthdef:").align_(\right); 
+	StaticText.new(w, 55@20).string_("synthdef:").align_(\right);
 	PopUpMenu.new(w, Rect(0,0,80,20))
 		.items_([\gab1st, \gabWide, \percSin, \percSinRev, \percNoise])
 		.action_({ |pop| tdef.envir.synName = pop.items[pop.value] });
-	
+
 	Button.new(w, 80@20).states_([[\continuous], [\fadeStops]])
 		.value_(tdef.envir.stopAfterFade.binaryValue)
 		.action_({ |btn|
diff --git a/Ch 8 Object Modeling/ObjMod1_shout_qcd.scd b/Ch 8 Object Modeling/ObjMod1_shout_qcd.scd
index d44fd8e..7896d8b 100644
--- a/Ch 8 Object Modeling/ObjMod1_shout_qcd.scd	
+++ b/Ch 8 Object Modeling/ObjMod1_shout_qcd.scd	
@@ -1,21 +1,21 @@
 
-/////////////////////// Object Modeling code figures /////////////////// 
+/////////////////////// Object Modeling code figures ///////////////////
 
 
 
 	// error and doesNotUnderstand
-{ SinOsc.ar }.pay; 
+{ SinOsc.ar }.pay;
 
 
-q = ( ); 	
+q = ( );
 q[\melA] = [0, 2, 3];
 q[\melA] + 10;
 
-	// Equivalently, put and at operations can be written like getter and setter messages: 
-q.melA_([0, 2, 3]); 	
+	// Equivalently, put and at operations can be written like getter and setter messages:
+q.melA_([0, 2, 3]);
 	// Or also:
 q.melA = [0, 2, 3];
-q.melA + 7; 
+q.melA + 7;
 
 	// One can organize repositories of objects hierarchically as well:
 q.mels = ();
@@ -28,15 +28,15 @@ q.playMel;
 
 
 	//	figure 8.1 - a Puppet class, and tests for it.
-	
-Puppet { 
+
+Puppet {
 	var <>myfreq; // an instance variable with a getter and a setter method
-	
+
 		// a method for creating a new object of this kind
 	*new { |myfreq=50| ^super.new.myfreq_(myfreq) }
-	
+
 		// a simple method that uses 'myfreq' for something audible.
-	blip { { Blip.ar(myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play; }
+	blip { { Blip.ar(myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play }
 }
 
 	// tests for the behavior implemented so far:
@@ -56,12 +56,12 @@ m.blip;		 // should sound differently
 
 	// figure  8.2 - a puppet modeled as an event.
 
-m = (); 			// make an empty event
+m = ();			// make an empty event
 m.myfreq_(50);	// put something in it with a setter method: a pseudo-instance variable
-m.myfreq;			// look it up with a getter method
-				// put a function into it with a setter: 
+m.myfreq;		// look it up with a getter method
+				// put a function into it with a setter:
 				// this becomes a pseudo-method
-m.blip_({ |ev| { Blip.ar(ev.myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play; });
+m.blip_({ |ev| { Blip.ar(ev.myfreq, 11) * XLine.kr(1, 0.01, 0.6, doneAction: 2) }.play });
 m.blip;		// execute the function with a pseudo-method call (same name)
 
 
@@ -70,11 +70,11 @@ m.blip;		// execute the function with a pseudo-method call (same name)
 	// figure  8.3 - add more instance variables, change the blip method.
 (
 m.numHarms_(20); 	// a new instvar
-m.decay_(0.3); 	// and another
+m.decay_(1); 	// and another
 				// update the blip method to use them:
-m.blip_({ |ev| 
-	{ Blip.ar(ev.myfreq, ev.numHarms) 
-	* XLine.kr(1, 0.01, ev.decay, doneAction: 2) }.play; 
+m.blip_({ |ev|
+	{ Blip.ar(ev.myfreq, ev.numHarms)
+	* XLine.kr(1, 0.01, ev.decay, doneAction: 2) }.play;
 });
 )
 m.blip;	// test
@@ -108,8 +108,8 @@ z.win.close;	// close when done
 (
 z.makeWin = { |z, message="Shout this!"|
 	z.win = Window("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = TextView(z.win, Rect(0, 0,1200, 100));
@@ -118,8 +118,8 @@ z.makeWin = { |z, message="Shout this!"|
 	z.txtView.background_(Color.clear);
 };
 )
-z.makeWin; 
-z.makeWin("Try showing that."); 
+z.makeWin;
+z.makeWin("Try showing that.");
 
 
 
@@ -132,7 +132,7 @@ z.setMessage = { |z, str| z.txtView.string_(str) };
 z.setMessage("Does this update?");	// test
 (
 z.shout = { |z, str|
-	if (z.win.isNil or: { z.win.isClosed }) { z.makeWin };
+	if(z.win.isNil or: { z.win.isClosed }) { z.makeWin };
 	z.setMessage(str);
 };
 )
@@ -149,30 +149,30 @@ z.shout("Do we get this too?"); // also when window has closed?
 
 z.txtView.stringColor_(Color.red);	// try a single color
 (
-z.animate = { |z, dt=0.2, n = 6| 
+z.animate = { |z, dt=0.2, n = 6|
 	var colors = [Color.red, Color.green, Color.black];
-	Task { 
-		n.do { |i|Ê
-			dt.wait; 
+	Task {
+		n.do { |i|
+			dt.wait;
 			z.txtView.stringColor_(colors.wrapAt(i))
 		}
 	}.play(AppClock)
 };
 )
-z.animate;			// test with default values 
+z.animate;			// test with default values
 z.animate(0.1, 24); 	// and test with arguments given
 
 
 
 
 
-	// figure 8.8 is an image // 
+	// figure 8.8 is an image //
 
 
 
 
 
-	// figure 8.9 - using codeDump to shout 
+	// figure 8.9 - using codeDump to shout
 
 this.codeDump = { |str, result, func| [str, result, func].printAll };
 
@@ -189,22 +189,22 @@ this.codeDump = { |str| if (str.beginsWith(z.shoutTag)) { z.shout(str.drop(z.sho
 
 	//	figure 8.10 - updated setMessage flashes text.
 (
-z.setMessage = { |z, str| 
-	var messSize = str.size; 
+z.setMessage = { |z, str|
+	var messSize = str.size;
 	var fontsize = (1.64 * z.txtView.bounds.width) / max(messSize, 32);
 	z.txtView.font_(GUI.font.new("Monaco", fontsize));
 	z.txtView.string_(str);
 	z.animate;
 };
 )
-//!! a long comment gets scaled down to a rather smaller font size, minimally fontsize 32! 
+//!! a long comment gets scaled down to a rather smaller font size, minimally fontsize 32!
 
 //!! short is big!
 (
 z.makeWin = { |q, message="Shout this!"|
 	z.win = Window("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = TextView(z.win, Rect(0, 0,1200, 100));
@@ -218,7 +218,7 @@ z.makeWin("shout.");
 
 
 	// class files can be put into one of these locations:
-Platform.userExtensionDir; 
+Platform.userExtensionDir;
 Platform.systemExtensionDir;
 
 
@@ -228,16 +228,16 @@ Platform.systemExtensionDir;
 Shout {
 	classvar <>tag="//!!";
 	var <win, <txtView;
-	
+
 	*new { ^super.new }
-} 
+}
 // end of file - Shout.sc
 
-// tests: 
+// tests:
 Shout.tag;
 Shout.tag_("//SHOUT");
 
-a = Shout.new; 
+a = Shout.new;
 a.win;
 a.txtView;
 
@@ -248,14 +248,14 @@ a.txtView;
 
 // begin of file - Shout.sc
 Shout {
-	classvar <>tag="//!!", <>width=1250, <>defaultCodeDumpFunc; 
+	classvar <>tag="//!!", <>width=1250, <>defaultCodeDumpFunc;
 	var <win, <txtView;
-	
-	*initClass { 
+
+	*initClass {
 		defaultCodeDumpFunc = { |str| if (str.beginsWith(tag)) { Shout(str.drop(tag.size)) } };
 	}
 	*new { ^super.new }
-} 
+}
 // end of Shout.sc
 
 Shout.width;
@@ -268,8 +268,8 @@ Shout.defaultCodeDumpFunc;
 
 z.makeWin = { |message="Shout this!"|
 	z.win = GUI.window.new("Shout", Rect(0, 900,1200, 100)).front;
-	z.win.alpha_(0.7);	
-	z.win.view.background_(Color.clear);	
+	z.win.alpha_(0.7);
+	z.win.view.background_(Color.clear);
 	z.win.alwaysOnTop_(true);
 
 	z.txtView = GUI.textView.new(z.win, Rect(0, 0,1200, 100));
@@ -278,24 +278,24 @@ z.makeWin = { |message="Shout this!"|
 };
 
 
-Shout {	
+Shout {
 	...
 	*new { |message| ^super.new.makeWin(message); }
-	
-	makeWin { |message="Shout this!"| 
-	
+
+	makeWin { |message="Shout this!"|
+
 		win = Window("Shout'er", Rect(20, 800, width, 80)).front;
 		win.alpha_(0.7);
 		win.view.background_(Color.clear);
 		win.alwaysOnTop_(true);
-		
+
 		txtView = TextView(win, win.bounds.moveTo(0,0));
 		txtView.background_(Color.clear);
 		txtView.font_(Font.new("Monaco", 32));
 		this.setMessage(message);
 	}
 
-	setMessage { |message| 
+	setMessage { |message|
 		txtView.string_(message.asString)
 	}
 }
@@ -317,26 +317,26 @@ z.shout = { |z, str|
 	z.setMessage(str);
 };
 
-Shout { 
+Shout {
 	classvar <top;
 	...
-	*new { |message="ÁShout'er!"| 
+	*new { |message="Shout'er!"|
 
-		if (top.isNil or: { top.win.isClosed }) { 
-			top = this.basicNew(message); 
+		if (top.isNil or: { top.win.isClosed }) {
+			top = this.basicNew(message);
 		} {
 			top.setMessage(message);
 		};
 	}
 		// the method formerly known as *new
-	*basicNew { |message="Shout this!"| ^super.new.makeWin(message) } 
+	*basicNew { |message="Shout this!"| ^super.new.makeWin(message) }
 
 	*close { try { top.win.close } }
-	
+
 	...
 }
 
-// tests: 
+// tests:
 Shout("Test 1, 2");
 Shout("Test 1, 2, 3, 4");	// same window
 Shout.close;
@@ -348,62 +348,62 @@ Shout("Test 1, 2");		// new window
 
 	//	figure 8.15 - converting animate to a class method.
 
-z.animate = { |z, dt=0.2, n = 6| 
+z.animate = { |z, dt=0.2, n = 6|
 	var colors = [Color.red, Color.green, Color.black];
-	Task { 
-		n.do { |i|Ê
-			dt.wait; 
+	Task {
+		n.do { |i|
+			dt.wait;
 			z.txtView.stringColor_(colors.wrapAt(i))
 		}
 	}.play(AppClock)
 };
 
-Shout { 
+Shout {
 	...
 	animate { |dt=0.2, n=6|
-		var colors = [Color.red, Color.green, Color.black]; 
-		Task { 
-			n.do { |i| 
-				txtView.stringColor_(colors.wrapAt(i)); 
-				dt.wait 
+		var colors = [Color.red, Color.green, Color.black];
+		Task {
+			n.do { |i|
+				txtView.stringColor_(colors.wrapAt(i));
+				dt.wait
 			};
 			txtView.stringColor_(Color.black); // make sure we end black
 		}.play(AppClock);
 	}
-	...	
+	...
 }
 
-// tests: 
+// tests:
 a = Shout("Test 1, 2");
 Shout.top.animate;
 
 
 
- 
+
 	// figure 8.16 - converting setMessage
 
-z.setMessage = { |z, str| 
-	var messSize = str.size; 
+z.setMessage = { |z, str|
+	var messSize = str.size;
 	var fontsize = (1.64 * z.txtView.bounds.width) / max(messSize, 32);
 	z.txtView.font_(GUI.font.new("Monaco", fontsize));
 	z.txtView.string_(str);
 	z.animate;
 };
 
-Shout { 
+Shout {
 	...
-	setMessage { |message| 
+	setMessage { |message|
 		var messSize, fontSize;
 		messSize = message.size;
 		fontSize = (1.64 * width) / max(messSize, 32);
-		
-		defer { 
+
+		defer {
 			txtView.font_(Font("Monaco", fontSize))
 				.string_(message.asString);
 		};
 		this.animate;
 	}
-	...	
+	...
 }
 
 Shout("Test 1, 2");
@@ -424,18 +424,18 @@ this.codeDump.postcs	// should be gone now
 
 //!! should be off again
 
-Shout { 
+Shout {
 	...
-	*add { var interp = thisProcess.interpreter; 
+	*add { var interp = thisProcess.interpreter;
 		interp.codeDump = interp.codeDump
-			.removeFunc(defaultCodeDumpFunc) // remove it first so it will 
+			.removeFunc(defaultCodeDumpFunc) // remove it first so it will
 										// only be in the list once
-			.addFunc(defaultCodeDumpFunc); 
+			.addFunc(defaultCodeDumpFunc);
 	}
-	*remove { var interp = thisProcess.interpreter; 
-		interp.codeDump = interp.codeDump.removeFunc(defaultCodeDumpFunc); 
+	*remove { var interp = thisProcess.interpreter;
+		interp.codeDump = interp.codeDump.removeFunc(defaultCodeDumpFunc);
 	}
-	...	
+	...
 }
 
 // tests
@@ -453,28 +453,28 @@ Shout.close;
 Shout("blabla");	// now typing is impossible, because the new window is in front.
 
 Shout("blabla blabla");	// now one can type, because Shout window was already there.
-Shout.close; 
+Shout.close;
 
 	// this does not work, because the shout window gets put in front later:
-d = Document.current; Shout(\bla); d.front; 
- 
+d = Document.current; Shout(\bla); d.front;
+
 
 	// This can be wrapped around the call to this.makeWin in Shout:new:
-Shout { 
+Shout {
 	...
-	*new { |message="ÁShout'er!"| 
+	*new { |message="Shout'er!"|
 		var currDoc;
 
-		if (win.isNil or: { win.isClosed }) { 
+		if (win.isNil or: { win.isClosed }) {
 			currDoc = Document.current;
-			top = this.basicNew(message); 
+			top = this.basicNew(message);
 				// wait a little before restoring front window
 			defer ({ currDoc.front }, 0.1);
 		} {
 			top.setMessage(message);
 		};
 	}
-	...	
+	...
 }
 
 
@@ -490,8 +490,8 @@ q.data = "~/data/share/QCD/data/*.nojunk".pathMatch.collect{|path|
 	b = SoundFile.new;
 	b.openWrite(path.replace("txt.nojunk", "aiff"));
 	b.writeData(a).postln;
-	b.close; 
-	a;	
+	b.close;
+	a;
 }
 )
 
@@ -504,8 +504,8 @@ serialize {|index, pos, extent = 8|
 	var ranges, slice;
 
 	// get ranges
-	ranges = pos.collect{|pos, i| 
-		((pos-(extent*0.5))..(pos+(extent*0.5)-1)) % this.shape[i] 
+	ranges = pos.collect{|pos, i|
+		((pos-(extent*0.5))..(pos+(extent*0.5)-1)) % this.shape[i]
 	};
 	// get sub-slice
 	slice = this.slice(index, *ranges);
@@ -527,7 +527,7 @@ serialize {|index, pos, extent = 8, how = \hilbert|
 
 
 
-// figure 8.21 here Ñ some initial serialization methods, and adding an alternative. 
+// figure 8.21 here  some initial serialization methods, and adding an alternative.
 
 	*initClass {|numDims = 4|
 		...
@@ -554,19 +554,19 @@ QCD.serTypes.put(\star, {|slice|
 	var numDims = 4;
 	var starShape;
 
-	starShape = neighbours1.collect({ |nb|  
-		(0..starSize).collect(_ * nb) 
-	}).flatten(1).collect {|indexN| 
-		indexN + (starSize.div(2)+1).dup(numDims) 
+	starShape = neighbours1.collect({ |nb|
+		(0..starSize).collect(_ * nb)
+	}).flatten(1).collect {|indexN|
+		indexN + (starSize.div(2)+1).dup(numDims)
 	};
-	
-	starShape.collect{|iA| slice.slice(*iA)}
+
+	starShape.collect{ |iA| slice.slice(*iA) }
 });
 
 
 
 
 
-///////// continued in ObjMod2_CloudGenMini.scd ///// 
+///////// continued in ObjMod2_CloudGenMini.scd /////