diff --git a/pwiki/page.js b/pwiki/page.js
index 576f365..ef4dd58 100755
--- a/pwiki/page.js
+++ b/pwiki/page.js
@@ -1418,7 +1418,7 @@ object.Constructor('Page', BasePage, {
 								renderer: state.renderer,
 							}
 							// XXX this is ugly, can we avoid this???
-							yield this.__parser__.resolve(page, 
+							yield this.__parser__.parse(page, 
 								this.__parser__.expand(page, 
 									text, _state), _state)
 						} else {
@@ -2000,6 +2000,7 @@ module.System = {
 			+'<hr>'
 			+'<macro src="." join="@source(file-separator)">'
 				+'<h1 '
+						+'wikiwords="no" '
 						+'contenteditable '
 						// XXX need to make this savable...
 						+'oninput="saveLiveContent(\'@source(s ./path)/name\')">' 
@@ -2026,32 +2027,7 @@ module.System = {
 			<slot content>
 				<macro src=".." join="@source(file-separator)">
 					<h1 class="title-editor"
-							contenteditable 
-							oninput="saveContent(\'@source(s ./path)/title\', this.innerText)">
-						@source(./title)
-					</h1>
-					<pre class="editor"
 							wikiwords="no"
-							contenteditable
-							oninput="saveLiveContent(\'@source(s ./path)\', this.innerText)"
-					><quote filter="quote-tags" src="."/></pre> 
-				</macro>
-			</slot>`},
-
-	// XXX remove when bug (quote getting trash) fixed... 
-	edit_isolated: {
-		// XXX not sure if we should use .title or .name here...
-		text: object.doc`
-			<slot pre>
-				<title>@source(../title) (edit)</title>
-			</slot>
-
-			<slot parent>../..</slot>
-			<slot location>@source(../location/!)</slot>
-
-			<slot content>
-				<macro src=".." join="@source(file-separator)" isolated>
-					<h1 class="title-editor"
 							contenteditable 
 							oninput="saveContent(\'@source(s ./path)/title\', this.innerText)">
 						@source(./title)
diff --git a/pwiki/parser.js b/pwiki/parser.js
index 5f4e4ad..0d73db0 100755
--- a/pwiki/parser.js
+++ b/pwiki/parser.js
@@ -204,7 +204,7 @@ module.BaseParser = {
 					return a.pop().uncomment 
 						|| '' }) },
 
-	// Lexically split the string...
+	// Lexically split the string (generator)...
 	//
 	// 	<item> ::=
 	// 		<string>
@@ -322,7 +322,7 @@ module.BaseParser = {
 					yield str }
 				macro = true } } },
 
-	// Group block elements...
+	// Group block elements (generator)...
 	//
 	// 	<item> ::=
 	// 		<string>
diff --git a/pwiki2.js b/pwiki2.js
index 152af47..30f0929 100755
--- a/pwiki2.js
+++ b/pwiki2.js
@@ -18,18 +18,6 @@
 * 		- CLI										- 
 *
 *
-* XXX BUG: in .system/edit if macro is isolated then @quote(..) will 
-* 		for some reason get odd stuff like '[object Object]'...
-* 		these break:
-* 			/QuoteTest/edit_isolated 
-* 			/MacroSlotTest/edit_isolated 
-* 		these work:
-* 			/QuoteTest/edit
-* 			/MacroSlotTest/edit
-* 		...can't produce a minimal example (/QuoteTest) other than 
-* 		editing .system/edit...
-* 		...seems that in isolated mode some macros get expanded before/in @quote(..)
-* 		XXX remove .system/edit_isolated when done...
 * XXX MACRO: should <macro>'s isolated be on by default???
 * 			...do we need to isolate named macros too???
 * 			...should this isolation be one-directional???