diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57f80501ab..aeb5ea53b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Svelte changelog
 
+## 1.6.7
+
+* SSR: Fix apostrophes ([#267](https://github.com/sveltejs/svelte/issues/267))
+* Add `xmlns` attributes to SVGs ([#262](https://github.com/sveltejs/svelte/pull/262))
+
+## 1.6.6
+
+* Omit text from comment anchors ([#247](https://github.com/sveltejs/svelte/issues/247))
+* Handle `xlink` attributes ([#264](https://github.com/sveltejs/svelte/issues/264))
+
+## 1.6.5
+
+* Handle `<!doctype>` declarations ([#255](https://github.com/sveltejs/svelte/pull/255))
+
+## 1.6.4
+
+* Fix updates of yields inside each blocks ([20e1b05](https://github.com/sveltejs/svelte/commit/20e1b05c45dc9fcddfe2e7c5c9fc3109f0d45fa9))
+* SSR: Handle attributes with values that begin with a number ([#248](https://github.com/sveltejs/svelte/issues/248))
+* Handle multiline comments in CSS ([#252](https://github.com/sveltejs/svelte/issues/252))
+
 ## 1.6.3
 
 * Fix `{{yield}}` bugs for components inside `if` and `each` blocks ([#230](https://github.com/sveltejs/svelte/issues/230), [#231](https://github.com/sveltejs/svelte/issues/231))
diff --git a/package.json b/package.json
index 95e2b0b1f3..5997390973 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.6.3",
+  "version": "1.6.7",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 929d737700..649252557d 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -98,9 +98,9 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	createAnchor ( name, description = '' ) {
+	createAnchor ( name ) {
 		this.uses.createComment = true;
-		const renderStatement = `createComment( ${JSON.stringify( description )} )`;
+		const renderStatement = `createComment()`;
 		this.addElement( name, renderStatement, true );
 	}
 
@@ -174,11 +174,11 @@ export default function dom ( parsed, source, options, names ) {
 	const builders = {
 		main: new CodeBuilder(),
 		init: new CodeBuilder(),
-		set: new CodeBuilder()
+		_set: new CodeBuilder()
 	};
 
-	builders.set.addLine( 'var oldState = this._state;' );
-	builders.set.addLine( 'this._state = Object.assign( {}, oldState, newState );' );
+	builders._set.addLine( 'var oldState = this._state;' );
+	builders._set.addLine( 'this._state = Object.assign( {}, oldState, newState );' );
 
 	if ( computations.length ) {
 		const builder = new CodeBuilder();
@@ -197,11 +197,11 @@ export default function dom ( parsed, source, options, names ) {
 			}
 		` );
 
-		builders.set.addLine( `applyComputations( this._state, newState, oldState )` );
+		builders._set.addLine( `applyComputations( this._state, newState, oldState )` );
 	}
 
 	// TODO is the `if` necessary?
-	builders.set.addBlock( deindent`
+	builders._set.addBlock( deindent`
 		dispatchObservers( this, this._observers.pre, newState, oldState );
 		if ( this._fragment ) this._fragment.update( newState, this._state );
 		dispatchObservers( this, this._observers.post, newState, oldState );
@@ -246,7 +246,7 @@ export default function dom ( parsed, source, options, names ) {
 			while ( this._bindings.length ) this._bindings.pop()();
 		` );
 
-		builders.set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
+		builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
 	} else {
 		builders.init.addBlock( deindent`
 			this._fragment = renderMainFragment( this._state, this );
@@ -255,15 +255,10 @@ export default function dom ( parsed, source, options, names ) {
 	}
 
 	if ( generator.hasComponents ) {
-		const statement = deindent`
-			while ( this._renderHooks.length ) {
-				var hook = this._renderHooks.pop();
-				hook.fn.call( hook.context );
-			}
-		`;
+		const statement = `this._flush();`;
 
 		builders.init.addBlock( statement );
-		builders.set.addBlock( statement );
+		builders._set.addBlock( statement );
 	}
 
 	if ( templateProperties.onrender ) {
@@ -310,6 +305,8 @@ export default function dom ( parsed, source, options, names ) {
 			${name}.prototype.fire = fire;
 			${name}.prototype.observe = observe;
 			${name}.prototype.on = on;
+			${name}.prototype.set = set;
+			${name}.prototype._flush = _flush;
 		` :
 		deindent`
 			${name}.prototype.get = ${shared.get};
@@ -319,11 +316,15 @@ export default function dom ( parsed, source, options, names ) {
 			${name}.prototype.observe = ${shared.observe};
 
 			${name}.prototype.on = ${shared.on};
+
+			${name}.prototype.set = ${shared.set};
+
+			${name}.prototype._flush = ${shared._flush};
 		` );
 
 	builders.main.addBlock( deindent`
-		${name}.prototype.set = function set ( newState ) {
-			${builders.set}
+		${name}.prototype._set = function _set ( newState ) {
+			${builders._set}
 		};
 
 		${name}.prototype.teardown = function teardown ( detach ) {
@@ -341,7 +342,7 @@ export default function dom ( parsed, source, options, names ) {
 			throw new Error( `Components with shared helpers must be compiled to ES2015 modules (format: 'es')` );
 		}
 
-		const names = [ 'get', 'fire', 'observe', 'on', 'dispatchObservers' ].concat( Object.keys( generator.uses ) );
+		const names = [ 'get', 'fire', 'observe', 'on', 'set', '_flush', 'dispatchObservers' ].concat( Object.keys( generator.uses ) );
 		builders.main.addLineAtStart(
 			`import { ${names.join( ', ' )} } from ${JSON.stringify( sharedPath )}`
 		);
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 2799a421b8..700e16ef7a 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -21,7 +21,7 @@ export default {
 		const { dependencies, snippet } = generator.contextualise( node.expression );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#each ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addLine( `var ${name}_value = ${snippet};` );
 		generator.current.builders.init.addLine( `var ${iterations} = [];` );
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 02133e539d..5ceb42d48b 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -41,7 +41,7 @@ export default {
 		const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `renderIfBlock` ) );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#if ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addBlock( deindent`
 			function ${getBlock} ( ${params} ) {
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 5fefcd73a3..98996486c1 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,7 +1,7 @@
 export default {
 	enter ( generator ) {
 		const anchor = `yield_anchor`;
-		generator.createAnchor( anchor, 'yield' );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.mount.addLine(
 			`component._yield && component._yield.mount( ${generator.current.target}, ${anchor} );`
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 490d330348..c91d369b6d 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -5,15 +5,24 @@ import flattenReference from '../../../../utils/flattenReference.js';
 
 export default function addElementAttributes ( generator, node, local ) {
 	node.attributes.forEach( attribute => {
+		const name = attribute.name;
+
 		if ( attribute.type === 'Attribute' ) {
-			let metadata = local.namespace ? null : attributeLookup[ attribute.name ];
+			let metadata = local.namespace ? null : attributeLookup[ name ];
 			if ( metadata && metadata.appliesTo && !~metadata.appliesTo.indexOf( node.name ) ) metadata = null;
 
 			let dynamic = false;
 
-			const isBoundOptionValue = node.name === 'option' && attribute.name === 'value'; // TODO check it's actually bound
+			const isBoundOptionValue = node.name === 'option' && name === 'value'; // TODO check it's actually bound
 			const propertyName = isBoundOptionValue ? '__value' : metadata && metadata.propertyName;
 
+			const isXlink = name.slice( 0, 6 ) === 'xlink:';
+
+			// xlink is a special case... we could maybe extend this to generic
+			// namespaced attributes but I'm not sure that's applicable in
+			// HTML5?
+			const helper = isXlink ? 'setXlinkAttribute' : 'setAttribute';
+
 			if ( attribute.value === true ) {
 				// attributes without values, e.g. <textarea readonly>
 				if ( propertyName ) {
@@ -21,14 +30,14 @@ export default function addElementAttributes ( generator, node, local ) {
 						`${local.name}.${propertyName} = true;`
 					);
 				} else {
-					generator.uses.setAttribute = true;
+					generator.uses[ helper ] = true;
 					local.init.addLine(
-						`setAttribute( ${local.name}, '${attribute.name}', true );`
+						`${helper}( ${local.name}, '${name}', true );`
 					);
 				}
 
 				// special case – autofocus. has to be handled in a bit of a weird way
-				if ( attribute.name === 'autofocus' ) {
+				if ( name === 'autofocus' ) {
 					generator.current.autofocus = local.name;
 				}
 			}
@@ -39,9 +48,9 @@ export default function addElementAttributes ( generator, node, local ) {
 						`${local.name}.${propertyName} = '';`
 					);
 				} else {
-					generator.uses.setAttribute = true;
+					generator.uses[ helper ] = true;
 					local.init.addLine(
-						`setAttribute( ${local.name}, '${attribute.name}', '' );`
+						`${helper}( ${local.name}, '${name}', '' );`
 					);
 				}
 			}
@@ -55,18 +64,24 @@ export default function addElementAttributes ( generator, node, local ) {
 					// static attributes
 					result = JSON.stringify( value.data );
 
-					if ( attribute.name === 'xmlns' ) {
+					let addAttribute = false;
+					if ( name === 'xmlns' ) {
 						// special case
 						// TODO this attribute must be static – enforce at compile time
 						local.namespace = value.data;
+						addAttribute = true;
 					} else if ( propertyName ) {
 						local.init.addLine(
 							`${local.name}.${propertyName} = ${result};`
 						);
 					} else {
-						generator.uses.setAttribute = true;
+						addAttribute = true;
+					}
+
+					if ( addAttribute ) {
+						generator.uses[ helper ] = true;
 						local.init.addLine(
-							`setAttribute( ${local.name}, '${attribute.name}', ${result} );`
+							`${helper}( ${local.name}, '${name}', ${result} );`
 						);
 					}
 				}
@@ -81,8 +96,8 @@ export default function addElementAttributes ( generator, node, local ) {
 					if (propertyName) {
 						updater = `${local.name}.${propertyName} = ${snippet};`;
 					} else {
-						generator.uses.setAttribute = true;
-						updater = `setAttribute( ${local.name}, '${attribute.name}', ${snippet} );`; // TODO use snippet both times – see note below
+						generator.uses[ helper ] = true;
+						updater = `${helper}( ${local.name}, '${name}', ${snippet} );`; // TODO use snippet both times – see note below
 					}
 
 					local.init.addLine( updater );
@@ -110,8 +125,8 @@ export default function addElementAttributes ( generator, node, local ) {
 				if (propertyName) {
 					updater = `${local.name}.${propertyName} = ${value};`;
 				} else {
-					generator.uses.setAttribute = true;
-					updater = `setAttribute( ${local.name}, '${attribute.name}', ${value} );`;
+					generator.uses[ helper ] = true;
+					updater = `${helper}( ${local.name}, '${name}', ${value} );`;
 				}
 
 				local.init.addLine( updater );
@@ -153,12 +168,12 @@ export default function addElementAttributes ( generator, node, local ) {
 				return `var ${listName} = this.__svelte.${listName}, ${indexName} = this.__svelte.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
 
-			const handlerName = generator.current.getUniqueName( `${attribute.name}Handler` );
+			const handlerName = generator.current.getUniqueName( `${name}Handler` );
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
-			if ( attribute.name in generator.events ) {
+			if ( name in generator.events ) {
 				local.init.addBlock( deindent`
-					var ${handlerName} = template.events.${attribute.name}.call( component, ${local.name}, function ( event ) {
+					var ${handlerName} = template.events.${name}.call( component, ${local.name}, function ( event ) {
 						${handlerBody}
 					});
 				` );
@@ -174,11 +189,11 @@ export default function addElementAttributes ( generator, node, local ) {
 						${handlerBody}
 					}
 
-					addEventListener( ${local.name}, '${attribute.name}', ${handlerName} );
+					addEventListener( ${local.name}, '${name}', ${handlerName} );
 				` );
 
 				generator.current.builders.teardown.addLine( deindent`
-					removeEventListener( ${local.name}, '${attribute.name}', ${handlerName} );
+					removeEventListener( ${local.name}, '${name}', ${handlerName} );
 				` );
 			}
 		}
@@ -191,11 +206,11 @@ export default function addElementAttributes ( generator, node, local ) {
 			generator.usesRefs = true;
 
 			local.init.addLine(
-				`component.refs.${attribute.name} = ${local.name};`
+				`component.refs.${name} = ${local.name};`
 			);
 
 			generator.current.builders.teardown.addLine( deindent`
-				if ( component.refs.${attribute.name} === ${local.name} ) component.refs.${attribute.name} = null;
+				if ( component.refs.${name} === ${local.name} ) component.refs.${name} = null;
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/attributes/binding/index.js b/src/generators/dom/visitors/attributes/binding/index.js
index a546d2fa97..1ed1dde6e5 100644
--- a/src/generators/dom/visitors/attributes/binding/index.js
+++ b/src/generators/dom/visitors/attributes/binding/index.js
@@ -64,7 +64,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 			var index = this.__svelte.${indexName};
 			list[index]${parts.slice( 1 ).map( part => `.${part}` ).join( '' )} = ${value};
 
-			component.set({ ${prop}: component.get( '${prop}' ) });
+			component._set({ ${prop}: component.get( '${prop}' ) });
 		`;
 	} else if ( deep ) {
 		setter = deindent`
@@ -98,7 +98,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 
 		local.update.addBlock( deindent`
 			if ( !${local.name}_updating && '${parts[0]}' in changed ) {
-				${local.name}.set({ ${attribute.name}: ${contextual ? attribute.value : `root.${attribute.value}`} });
+				${local.name}._set({ ${attribute.name}: ${contextual ? attribute.value : `root.${attribute.value}`} });
 			}
 		` );
 	} else {
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index d74c720036..3187622f79 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -112,7 +112,7 @@ export default function ssr ( parsed, source, options, names ) {
 
 		var escaped = {
 			'"': '&quot;',
-			"'": '&39;',
+			"'": '&#39;',
 			'&': '&amp;',
 			'<': '&lt;',
 			'>': '&gt;'
diff --git a/src/generators/shared/css/transform.js b/src/generators/shared/css/transform.js
index 803c16d47a..12ae0981e5 100644
--- a/src/generators/shared/css/transform.js
+++ b/src/generators/shared/css/transform.js
@@ -1,6 +1,6 @@
 // largely borrowed from Ractive – https://github.com/ractivejs/ractive/blob/2ec648aaf5296bb88c21812e947e0e42fcc456e3/src/Ractive/config/custom/css/transform.js
 const selectorsPattern = /(?:^|\})?\s*([^\{\}]+)\s*\{/g;
-const commentsPattern = /\/\*.*?\*\//g;
+const commentsPattern = /\/\*[\s\S]*?\*\//g;
 const selectorUnitPattern = /((?:(?:\[[^\]+]\])|(?:[^\s\+\>~:]))+)((?:::?[^\s\+\>\~\(:]+(?:\([^\)]+\))?)*\s*[\s\+\>\~]?)\s*/g;
 const excludePattern = /^(?:@|\d+%)/;
 
diff --git a/src/parse/state/tag.js b/src/parse/state/tag.js
index 2db102ab0d..72f73f0651 100644
--- a/src/parse/state/tag.js
+++ b/src/parse/state/tag.js
@@ -6,7 +6,7 @@ import { trimStart, trimEnd } from '../utils/trim.js';
 import { decodeCharacterReferences } from '../utils/html.js';
 import voidElementNames from '../../utils/voidElementNames.js';
 
-const validTagName = /^[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
+const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 const invalidUnquotedAttributeCharacters = /[\s"'=<>\/`]/;
 
 const specials = {
diff --git a/src/shared/dom.js b/src/shared/dom.js
index 9d4231572f..574b672ce5 100644
--- a/src/shared/dom.js
+++ b/src/shared/dom.js
@@ -34,8 +34,8 @@ export function createText ( data ) {
 	return document.createTextNode( data );
 }
 
-export function createComment ( data ) {
-	return document.createComment( data );
+export function createComment () {
+	return document.createComment( '' );
 }
 
 export function addEventListener ( node, event, handler ) {
@@ -49,3 +49,7 @@ export function removeEventListener ( node, event, handler ) {
 export function setAttribute ( node, attribute, value ) {
 	node.setAttribute ( attribute, value );
 }
+
+export function setXlinkAttribute ( node, attribute, value ) {
+	node.setAttributeNS( 'http://www.w3.org/1999/xlink', attribute, value );
+}
diff --git a/src/shared/methods.js b/src/shared/methods.js
index 4595a13523..34bcdac498 100644
--- a/src/shared/methods.js
+++ b/src/shared/methods.js
@@ -41,3 +41,17 @@ export function on ( eventName, handler ) {
 		}
 	};
 }
+
+export function set ( newState ) {
+	this._set( newState );
+	( this._root || this )._flush();
+}
+
+export function _flush () {
+	if ( !this._renderHooks ) return;
+
+	while ( this._renderHooks.length ) {
+		var hook = this._renderHooks.pop();
+		hook.fn.call( hook.context );
+	}
+}
diff --git a/src/utils/voidElementNames.js b/src/utils/voidElementNames.js
index 7df1d452b6..46306ac8c3 100644
--- a/src/utils/voidElementNames.js
+++ b/src/utils/voidElementNames.js
@@ -1 +1 @@
-export default /^(?:area|base|br|col|command|doctype|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
+export default /^(?:area|base|br|col|command|\!doctype|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
diff --git a/test/generator/attribute-dynamic-multiple/_config.js b/test/generator/attribute-dynamic-multiple/_config.js
index 83c6a58a86..1a0c602cb6 100644
--- a/test/generator/attribute-dynamic-multiple/_config.js
+++ b/test/generator/attribute-dynamic-multiple/_config.js
@@ -7,5 +7,5 @@ export default {
 		]
 	},
 
-	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!--#each items-->`
+	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!---->`
 };
diff --git a/test/generator/binding-input-text-contextual/_config.js b/test/generator/binding-input-text-contextual/_config.js
index 3f2d3f3fc0..332d2c6f39 100644
--- a/test/generator/binding-input-text-contextual/_config.js
+++ b/test/generator/binding-input-text-contextual/_config.js
@@ -6,7 +6,7 @@ export default {
 			'three'
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 		const items = component.get( 'items' );
@@ -18,12 +18,12 @@ export default {
 		inputs[1].dispatchEvent( event );
 
 		assert.equal( items[1], 'four' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		items[2] = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };
diff --git a/test/generator/binding-input-text-deep-contextual/_config.js b/test/generator/binding-input-text-deep-contextual/_config.js
index f24902a962..587110786c 100644
--- a/test/generator/binding-input-text-deep-contextual/_config.js
+++ b/test/generator/binding-input-text-deep-contextual/_config.js
@@ -6,7 +6,7 @@ export default {
 			{ description: 'three' }
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 
@@ -17,13 +17,13 @@ export default {
 		inputs[1].value = 'four';
 		inputs[1].dispatchEvent( event );
 
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		const items = component.get( 'items' );
 		items[2].description = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };
diff --git a/test/generator/component-yield-parent/_config.js b/test/generator/component-yield-parent/_config.js
index 28b8e175de..cc3b39ca81 100644
--- a/test/generator/component-yield-parent/_config.js
+++ b/test/generator/component-yield-parent/_config.js
@@ -2,8 +2,8 @@ export default {
 	html: '<div><p>Hello</p></div>',
 	test ( assert, component, target ) {
 		assert.equal( component.get( 'data' ), 'Hello' );
-		component.set({data: 'World'})
+		component.set({data: 'World'});
 		assert.equal( component.get( 'data' ), 'World' );
-		assert.equal( target.innerHTML, '<div><p>World<!--yield--></p></div>' );
+		assert.equal( target.innerHTML, '<div><p>World<!----></p></div>' );
 	}
-}
+};
diff --git a/test/generator/css-comments/_config.js b/test/generator/css-comments/_config.js
new file mode 100644
index 0000000000..f6235d06a2
--- /dev/null
+++ b/test/generator/css-comments/_config.js
@@ -0,0 +1,7 @@
+// JSDOM makes this test pass when it should fail. weird
+export default {
+	test ( assert, component, target, window ) {
+		const p = target.querySelector( 'p' );
+		assert.equal( window.getComputedStyle( p ).color, 'red' );
+	}
+};
diff --git a/test/generator/css-comments/main.html b/test/generator/css-comments/main.html
new file mode 100644
index 0000000000..68eebfdf38
--- /dev/null
+++ b/test/generator/css-comments/main.html
@@ -0,0 +1,11 @@
+<p>red</p>
+
+<style>
+	/*
+		div {}
+	*/
+
+	p {
+		color: red;
+	}
+</style>
diff --git a/test/generator/each-block-indexed/_config.js b/test/generator/each-block-indexed/_config.js
index 34640e18cb..5aaadafb05 100644
--- a/test/generator/each-block-indexed/_config.js
+++ b/test/generator/each-block-indexed/_config.js
@@ -2,5 +2,5 @@ export default {
 	data: {
 		animals: [ 'adder', 'blue whale', 'chameleon' ]
 	},
-	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!--#each animals-->`
+	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!---->`
 };
diff --git a/test/generator/each-block/_config.js b/test/generator/each-block/_config.js
index 959bf88c04..655556bedf 100644
--- a/test/generator/each-block/_config.js
+++ b/test/generator/each-block/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		animals: [ 'alpaca', 'baboon', 'capybara' ]
 	},
-	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!--#each animals-->',
+	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ animals: [ 'alpaca', 'baboon', 'caribou', 'dogfish' ] });
-		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!--#each animals-->' );
+		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!---->' );
 		component.set({ animals: [] });
-		assert.equal( target.innerHTML, '<!--#each animals-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 	}
 };
diff --git a/test/generator/each-blocks-expression/_config.js b/test/generator/each-blocks-expression/_config.js
index b610b055b4..239a18b6dc 100644
--- a/test/generator/each-blocks-expression/_config.js
+++ b/test/generator/each-blocks-expression/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>a</p><p>b</p><p>c</p><!--#each [ 'a', 'b', 'c' ]-->`
+	html: `<p>a</p><p>b</p><p>c</p><!---->`
 };
diff --git a/test/generator/each-blocks-nested-b/_config.js b/test/generator/each-blocks-nested-b/_config.js
index 806284ef2d..1ba0f685b8 100644
--- a/test/generator/each-blocks-nested-b/_config.js
+++ b/test/generator/each-blocks-nested-b/_config.js
@@ -28,7 +28,7 @@ export default {
 			}
 		]
 	},
-	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!--#each category.things--><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!--#each category.things--><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!--#each category.things--><!--#each categories-->`,
+	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->`,
 	test ( assert, component, target ) {
 		// TODO
 	}
diff --git a/test/generator/each-blocks-nested/_config.js b/test/generator/each-blocks-nested/_config.js
index 0c21561e75..5486c8274e 100644
--- a/test/generator/each-blocks-nested/_config.js
+++ b/test/generator/each-blocks-nested/_config.js
@@ -4,7 +4,7 @@ export default {
 		rows: [ 1, 2, 3 ]
 	},
 
-	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!--#each rows--><div>b, 1</div><div>b, 2</div><div>b, 3</div><!--#each rows--><div>c, 1</div><div>c, 2</div><div>c, 3</div><!--#each rows--><!--#each columns-->`,
+	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->`,
 
 	test ( assert, component, target ) {
 		// TODO
diff --git a/test/generator/event-handler-removal/_config.js b/test/generator/event-handler-removal/_config.js
index 91bc0452a5..b196db1765 100644
--- a/test/generator/event-handler-removal/_config.js
+++ b/test/generator/event-handler-removal/_config.js
@@ -1,7 +1,7 @@
 // TODO gah, JSDOM appears to behave differently to real browsers here... probably need to raise an issue
 
 export default {
-	html: '<input><!--#if visible-->',
+	html: '<input><!---->',
 	test ( assert, component ) {
 		component.refs.input.focus();
 
diff --git a/test/generator/event-handler/_config.js b/test/generator/event-handler/_config.js
index 5fb7f6bc86..8aa60ff387 100644
--- a/test/generator/event-handler/_config.js
+++ b/test/generator/event-handler/_config.js
@@ -1,13 +1,13 @@
 export default {
-	html: '<button>toggle</button>\n\n<!--#if visible-->',
+	html: '<button>toggle</button>\n\n<!---->',
 	test ( assert, component, target, window ) {
 		const button = target.querySelector( 'button' );
 		const event = new window.MouseEvent( 'click' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!---->' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!---->' );
 	}
 };
diff --git a/test/generator/if-block-widget/_config.js b/test/generator/if-block-widget/_config.js
index 674fefb0ba..40d9d050e9 100644
--- a/test/generator/if-block-widget/_config.js
+++ b/test/generator/if-block-widget/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: 'before\n<p>Widget</p><!--#if visible-->\nafter',
+	html: 'before\n<p>Widget</p><!---->\nafter',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, 'before\n<!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<!---->\nafter' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!---->\nafter' );
 	}
 };
diff --git a/test/generator/if-block/_config.js b/test/generator/if-block/_config.js
index f8014c5c9a..4194fd29bc 100644
--- a/test/generator/if-block/_config.js
+++ b/test/generator/if-block/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: '<p>i am visible</p><!--#if visible-->',
+	html: '<p>i am visible</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, '<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, '<p>i am visible</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<p>i am visible</p><!---->' );
 	}
 };
diff --git a/test/generator/onrender-chain/Item.html b/test/generator/onrender-chain/Item.html
new file mode 100644
index 0000000000..d039a445f1
--- /dev/null
+++ b/test/generator/onrender-chain/Item.html
@@ -0,0 +1,16 @@
+<span>{{foo}}</span>
+
+<script>
+	export default {
+		data () {
+			return {
+				foo: 'XX'
+			};
+		},
+		onrender () {
+			this.observe( 'item', item => {
+				this.set({ foo: item });
+			});
+		}
+	};
+</script>
diff --git a/test/generator/onrender-chain/List.html b/test/generator/onrender-chain/List.html
new file mode 100644
index 0000000000..5bf8f12cd8
--- /dev/null
+++ b/test/generator/onrender-chain/List.html
@@ -0,0 +1,25 @@
+{{#each items as item}}
+	<Item item={{item}} />
+{{/each}}
+
+<script>
+	import Item from './Item.html';
+
+	export default {
+		data () {
+			return {
+				items: [ 3, 2, 1 ]
+			};
+		},
+		methods: {
+			update () {
+				this.set({
+					items: [ 1, 2, 3, 4, 5 ]
+				});
+			}
+		},
+		components: {
+			Item
+		}
+	};
+</script>
diff --git a/test/generator/onrender-chain/_config.js b/test/generator/onrender-chain/_config.js
new file mode 100644
index 0000000000..348f66cd6f
--- /dev/null
+++ b/test/generator/onrender-chain/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: `
+		<span>3</span><span>2</span><span>1</span>
+	`,
+
+	test ( assert, component, target ) {
+		component.refs.list.update();
+
+		assert.htmlEqual( target.innerHTML, `
+			<span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>
+		` );
+
+		component.teardown();
+	}
+};
diff --git a/test/generator/onrender-chain/main.html b/test/generator/onrender-chain/main.html
new file mode 100644
index 0000000000..90dc4c94d9
--- /dev/null
+++ b/test/generator/onrender-chain/main.html
@@ -0,0 +1,11 @@
+<List ref:list/>
+
+<script>
+	import List from './List.html';
+
+	export default {
+		components: {
+			List
+		}
+	};
+</script>
diff --git a/test/generator/svg-xlink/_config.js b/test/generator/svg-xlink/_config.js
new file mode 100644
index 0000000000..eb49f3a72a
--- /dev/null
+++ b/test/generator/svg-xlink/_config.js
@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<svg>
+			<defs>
+				<circle id='stamp' r='10' fill='blue'/>
+			</defs>
+
+			<use xlink:href='#stamp' x='20' y='20'/>
+		</svg>
+	`,
+	test ( assert, component, target ) {
+		const use = target.querySelector( 'use' );
+		const href = use.attributes[ 'xlink:href' ];
+
+		assert.equal( href.namespaceURI, 'http://www.w3.org/1999/xlink' );
+
+		component.teardown();
+	}
+};
diff --git a/test/generator/svg-xlink/main.html b/test/generator/svg-xlink/main.html
new file mode 100644
index 0000000000..d24b1510a7
--- /dev/null
+++ b/test/generator/svg-xlink/main.html
@@ -0,0 +1,7 @@
+<svg>
+	<defs>
+		<circle id='stamp' r='10' fill='blue'/>
+	</defs>
+
+	<use xlink:href='#stamp' x='20' y='20'/>
+</svg>
diff --git a/test/generator/svg-xmlns/_config.js b/test/generator/svg-xmlns/_config.js
index 0df414232b..58a57c434f 100644
--- a/test/generator/svg-xmlns/_config.js
+++ b/test/generator/svg-xmlns/_config.js
@@ -8,7 +8,7 @@ export default {
 		height: 100
 	},
 
-	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+	html: `<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"></rect></svg>`,
 
 	test ( assert, component, target ) {
 		const svg = target.querySelector( 'svg' );
@@ -18,6 +18,6 @@ export default {
 		assert.equal( rect.namespaceURI, 'http://www.w3.org/2000/svg' );
 
 		component.set({ width: 150, height: 50 });
-		assert.equal( target.innerHTML, `<svg><rect x="0" y="0" width="150" height="50"></rect></svg>` );
+		assert.equal( target.innerHTML, `<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="150" height="50"></rect></svg>` );
 	}
 };
diff --git a/test/helpers.js b/test/helpers.js
index ee419c3921..cd50730811 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -65,6 +65,10 @@ function cleanChildren ( node ) {
 		}
 
 		if ( child.nodeType === 3 ) {
+			if ( node.namespaceURI === 'http://www.w3.org/2000/svg' && node.tagName !== 'text' && node.tagName !== 'tspan' ) {
+				node.removeChild( child );
+			}
+
 			child.data = child.data.replace( /\s{2,}/, '\n' );
 
 			// text
diff --git a/test/parser/elements/input.html b/test/parser/elements/input.html
new file mode 100644
index 0000000000..c50eddd41f
--- /dev/null
+++ b/test/parser/elements/input.html
@@ -0,0 +1 @@
+<!doctype html>
diff --git a/test/parser/elements/output.json b/test/parser/elements/output.json
new file mode 100644
index 0000000000..79608f9132
--- /dev/null
+++ b/test/parser/elements/output.json
@@ -0,0 +1,23 @@
+{
+    "html": {
+        "start": 0,
+        "end": 15,
+        "type": "Fragment",
+        "children": [{
+            "attributes": [{
+                "end": 14,
+                "name": "html",
+                "start": 10,
+                "type": "Attribute",
+                "value": true
+            }],
+            "children": [],
+            "end": 15,
+            "name": "!doctype",
+            "start": 0,
+            "type": "Element"
+        }]
+    },
+    "css": null,
+    "js": null
+}
diff --git a/test/server-side-rendering/dynamic-text-escaped/_actual.html b/test/server-side-rendering/dynamic-text-escaped/_actual.html
index 467e5de3d1..cd875b439e 100644
--- a/test/server-side-rendering/dynamic-text-escaped/_actual.html
+++ b/test/server-side-rendering/dynamic-text-escaped/_actual.html
@@ -1 +1 @@
-&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &39;this&39;&lt;/p&gt;
\ No newline at end of file
+&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &#39;this&#39;&lt;/p&gt;
\ No newline at end of file
diff --git a/test/server-side-rendering/dynamic-text-escaped/_expected.html b/test/server-side-rendering/dynamic-text-escaped/_expected.html
index 080992cfd2..20f85b71be 100644
--- a/test/server-side-rendering/dynamic-text-escaped/_expected.html
+++ b/test/server-side-rendering/dynamic-text-escaped/_expected.html
@@ -1 +1 @@
-&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &39;this&39;&lt;/p&gt;
+&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &#39;this&#39;&lt;/p&gt;
diff --git a/test/server-side-rendering/entities/_actual.html b/test/server-side-rendering/entities/_actual.html
new file mode 100644
index 0000000000..a7d44dafd3
--- /dev/null
+++ b/test/server-side-rendering/entities/_actual.html
@@ -0,0 +1 @@
+it&#39;s working
\ No newline at end of file
diff --git a/test/server-side-rendering/entities/_expected.html b/test/server-side-rendering/entities/_expected.html
new file mode 100644
index 0000000000..852764fc3f
--- /dev/null
+++ b/test/server-side-rendering/entities/_expected.html
@@ -0,0 +1 @@
+it's working
diff --git a/test/server-side-rendering/entities/data.json b/test/server-side-rendering/entities/data.json
new file mode 100644
index 0000000000..fb52b739cf
--- /dev/null
+++ b/test/server-side-rendering/entities/data.json
@@ -0,0 +1,3 @@
+{
+	"foo": "it's working"
+}
diff --git a/test/server-side-rendering/entities/main.html b/test/server-side-rendering/entities/main.html
new file mode 100644
index 0000000000..054e96cb81
--- /dev/null
+++ b/test/server-side-rendering/entities/main.html
@@ -0,0 +1 @@
+{{foo}}