diff --git a/README.md b/README.md
index 9664d8f4..913fdfe3 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,6 @@ There are over 4000 assertions in the test suite, and tests cover even difficult
 
 ## Modularity
 
-Despite the huge improvements in performance and modularity, the new codebase is smaller than v0.2.x, currently clocking at <!-- size -->7.54 KB<!-- /size --> min+gzip
+Despite the huge improvements in performance and modularity, the new codebase is smaller than v0.2.x, currently clocking at <!-- size -->7.55 KB<!-- /size --> min+gzip
 
 In addition, Mithril is now completely modular: you can import only the modules that you need and easily integrate 3rd party modules if you wish to use a different library for routing, ajax, and even rendering
diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index 7e2454cb..d70a7c23 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -51,7 +51,7 @@ o.spec("route", function() {
 					o(root.firstChild.nodeName).equals("DIV")
 				})
 
-				o("routed mount points can redraw synchronoulsy (#1275)", function() {
+				o("routed mount points can redraw synchronously (#1275)", function() {
 					var view = o.spy()
 
 					$window.location.href = prefix + "/"
@@ -66,7 +66,9 @@ o.spec("route", function() {
 				})
 
 				o("default route doesn't break back button", function(done) {
-					$window.location.href = "http://google.com"
+					$window.location.href = "http://old.com"
+					$window.location.href = "http://new.com"
+
 					route(root, "/a", {
 						"/a" : {
 							view: function() {
@@ -78,9 +80,12 @@ o.spec("route", function() {
 					callAsync(function() {
 						o(root.firstChild.nodeName).equals("DIV")
 
+						o(route.get()).equals("/a")
+
 						$window.history.back()
 
 						o($window.location.pathname).equals("/")
+						o($window.location.hostname).equals("old.com")
 
 						done()
 					})
@@ -574,7 +579,7 @@ o.spec("route", function() {
 
 						o(matchCount).equals(1)
 						o(renderCount).equals(2)
-						
+
 						done()
 					})
 				})
@@ -609,7 +614,7 @@ o.spec("route", function() {
 
 						o(matchCount).equals(1)
 						o(renderCount).equals(2)
-						
+
 						done()
 					})
 				})
@@ -617,7 +622,7 @@ o.spec("route", function() {
 				o("onmatch can redirect to another route", function(done) {
 					var redirected = false
 					var render = o.spy()
-					
+
 					$window.location.href = prefix + "/a"
 					route(root, "/a", {
 						"/a" : {
@@ -968,7 +973,7 @@ o.spec("route", function() {
 											o(renderA.callCount).equals(0)
 											o(renderB.callCount).equals(1)
 
-											done()											
+											done()
 										})
 									}, 20)
 								})
@@ -1190,19 +1195,19 @@ o.spec("route", function() {
 							}
 						},
 					})
-					
+
 					callAsync(function() { // tick for popstate for /a
 						callAsync(function() { // tick for promise in onmatch
 							callAsync(function() { // tick for onpopstate for /b
 								o(rendered).equals(false)
 								o(resolved).equals("b")
-								
+
 								done()
 							})
 						})
 					})
 				})
-				
+
 				o("throttles", function(done, timeout) {
 					timeout(200)
 
diff --git a/index.js b/index.js
index d849a317..6e69cea4 100644
--- a/index.js
+++ b/index.js
@@ -16,5 +16,6 @@ m.jsonp = requestService.jsonp
 m.parseQueryString = require("./querystring/parse")
 m.buildQueryString = require("./querystring/build")
 m.version = "bleeding-edge"
+m.vnode = require("./render/vnode")
 
 module.exports = m
diff --git a/mithril.js b/mithril.js
index 715ecc63..104a4dac 100644
--- a/mithril.js
+++ b/mithril.js
@@ -1098,7 +1098,7 @@ var _20 = function($window, redrawService0) {
 			if (render1 != null) redrawService0.render(root, render1(Vnode(component, attrs3.key, attrs3)))
 		}
 		var bail = function() {
-			routeService.setPath(defaultRoute)
+			routeService.setPath(defaultRoute, null, { replace: true })
 		}
 		routeService.defineRoutes(routes, function(payload, params, path) {
 			var update = lastUpdate = function(routeResolver, comp) {
@@ -1153,6 +1153,7 @@ m.jsonp = requestService.jsonp
 m.parseQueryString = parseQueryString
 m.buildQueryString = buildQueryString
 m.version = "1.0.0-rc.6"
+m.vnode = Vnode
 if (typeof module !== "undefined") module["exports"] = m
 else window.m = m
 }
\ No newline at end of file
diff --git a/mithril.min.js b/mithril.min.js
index 811aaac4..dc602474 100644
--- a/mithril.min.js
+++ b/mithril.min.js
@@ -1,41 +1,41 @@
-new function(){function u(a,c,h,d,g,m){return{tag:a,key:c,attrs:h,children:d,text:g,dom:m,domSize:void 0,state:{},events:void 0,instance:void 0,skip:!1}}function A(a){if(null==a||"string"!==typeof a&&null==a.view)throw Error("The selector must be either a string or a component.");if("string"===typeof a&&void 0===J[a]){for(var c,h,d=[],g={};c=P.exec(a);){var m=c[1],l=c[2];""===m&&""!==l?h=l:"#"===m?g.id=l:"."===m?d.push(l):"["===c[3][0]&&((m=c[6])&&(m=m.replace(/\\(["'])/g,"$1").replace(/\\\\/g,"\\")),
+new function(){function u(a,c,h,d,g,m){return{tag:a,key:c,attrs:h,children:d,text:g,dom:m,domSize:void 0,state:{},events:void 0,instance:void 0,skip:!1}}function z(a){if(null==a||"string"!==typeof a&&null==a.view)throw Error("The selector must be either a string or a component.");if("string"===typeof a&&void 0===J[a]){for(var c,h,d=[],g={};c=P.exec(a);){var m=c[1],l=c[2];""===m&&""!==l?h=l:"#"===m?g.id=l:"."===m?d.push(l):"["===c[3][0]&&((m=c[6])&&(m=m.replace(/\\(["'])/g,"$1").replace(/\\\\/g,"\\")),
 "class"===c[4]?d.push(m):g[c[4]]=m||!0)}0<d.length&&(g.className=d.join(" "));J[a]=function(a,c){var m=!1,b,p,d=a.className||a["class"],w;for(w in g)a[w]=g[w];void 0!==d&&(void 0!==a["class"]&&(a["class"]=void 0,a.className=d),void 0!==g.className&&(a.className=g.className+" "+d));for(w in a)if("key"!==w){m=!0;break}c instanceof Array&&1==c.length&&null!=c[0]&&"#"===c[0].tag?p=c[0].children:b=c;return u(h||"div",a.key,m?a:void 0,b,p,void 0)}}var n;null!=arguments[1]&&("object"!==typeof arguments[1]||
 void 0!==arguments[1].tag||arguments[1]instanceof Array)?d=1:(n=arguments[1],d=2);if(arguments.length===d+1)c=arguments[d]instanceof Array?arguments[d]:[arguments[d]];else for(c=[];d<arguments.length;d++)c.push(arguments[d]);return"string"===typeof a?J[a](n||{},u.normalizeChildren(c)):u(a,n&&n.key,n||{},u.normalizeChildren(c),void 0,void 0)}function Q(a){var c=0,h=null,d="function"===typeof requestAnimationFrame?requestAnimationFrame:setTimeout;return function(){var g=Date.now();0===c||16<=g-c?(c=
-g,a()):null===h&&(h=d(function(){h=null;a();c=Date.now()},16-(g-c)))}}u.normalize=function(a){return a instanceof Array?u("[",void 0,void 0,u.normalizeChildren(a),void 0,void 0):null!=a&&"object"!==typeof a?u("#",void 0,void 0,a,void 0,void 0):a};u.normalizeChildren=function(a){for(var c=0;c<a.length;c++)a[c]=u.normalize(a[c]);return a};var P=/(?:(^|#|\.)([^#\.\[\]]+))|(\[(.+?)(?:\s*=\s*("|'|)((?:\\["'\]]|.)*?)\5)?\])/g,J={};A.trust=function(a){null==a&&(a="");return u("<",void 0,void 0,a,void 0,
-void 0)};A.fragment=function(a,c){return u("[",a.key,a,u.normalizeChildren(c),void 0,void 0)};var z=function(a){function c(a,b){return function q(c){var l;try{if(!b||null==c||"object"!==typeof c&&"function"!==typeof c||"function"!==typeof(l=c.then))k(function(){b||0!==a.length||console.error("Possible unhandled promise rejection:",c);for(var d=0;d<a.length;d++)a[d](c);g.length=0;m.length=0;p.state=b;p.retry=function(){q(c)}});else{if(c===d)throw new TypeError("Promise can't be resolved w/ itself");
-h(l.bind(c))}}catch(R){n(R)}}}function h(a){function b(b){return function(a){0<c++||b(a)}}var c=0,d=b(n);try{a(b(l),d)}catch(w){d(w)}}if(!(this instanceof z))throw Error("Promise must be called with `new`");if("function"!==typeof a)throw new TypeError("executor must be a function");var d=this,g=[],m=[],l=c(g,!0),n=c(m,!1),p=d._instance={resolvers:g,rejectors:m},k="function"===typeof setImmediate?setImmediate:setTimeout;h(a)};z.prototype.then=function(a,c){function h(a,c,h,l){c.push(function(b){if("function"!==
-typeof a)h(b);else try{g(a(b))}catch(C){m&&m(C)}});"function"===typeof d.retry&&l===d.state&&d.retry()}var d=this._instance,g,m,l=new z(function(a,c){g=a;m=c});h(a,d.resolvers,g,!0);h(c,d.rejectors,m,!1);return l};z.prototype["catch"]=function(a){return this.then(null,a)};z.resolve=function(a){return a instanceof z?a:new z(function(c){c(a)})};z.reject=function(a){return new z(function(c,h){h(a)})};z.all=function(a){return new z(function(c,h){var d=a.length,g=0,m=[];if(0===a.length)c([]);else for(var l=
-0;l<a.length;l++)(function(l){function p(a){g++;m[l]=a;g===d&&c(m)}null==a[l]||"object"!==typeof a[l]&&"function"!==typeof a[l]||"function"!==typeof a[l].then?p(a[l]):a[l].then(p,h)})(l)})};z.race=function(a){return new z(function(c,h){for(var d=0;d<a.length;d++)a[d].then(c,h)})};"undefined"===typeof D&&("undefined"!==typeof window?window.Promise=z:"undefined"!==typeof global&&(global.Promise=z));var G="undefined"!==typeof D?D:z,H=function(a){function c(a,d){if(d instanceof Array)for(var g=0;g<d.length;g++)c(a+
+g,a()):null===h&&(h=d(function(){h=null;a();c=Date.now()},16-(g-c)))}}u.normalize=function(a){return a instanceof Array?u("[",void 0,void 0,u.normalizeChildren(a),void 0,void 0):null!=a&&"object"!==typeof a?u("#",void 0,void 0,a,void 0,void 0):a};u.normalizeChildren=function(a){for(var c=0;c<a.length;c++)a[c]=u.normalize(a[c]);return a};var P=/(?:(^|#|\.)([^#\.\[\]]+))|(\[(.+?)(?:\s*=\s*("|'|)((?:\\["'\]]|.)*?)\5)?\])/g,J={};z.trust=function(a){null==a&&(a="");return u("<",void 0,void 0,a,void 0,
+void 0)};z.fragment=function(a,c){return u("[",a.key,a,u.normalizeChildren(c),void 0,void 0)};var A=function(a){function c(a,b){return function q(c){var l;try{if(!b||null==c||"object"!==typeof c&&"function"!==typeof c||"function"!==typeof(l=c.then))k(function(){b||0!==a.length||console.error("Possible unhandled promise rejection:",c);for(var d=0;d<a.length;d++)a[d](c);g.length=0;m.length=0;p.state=b;p.retry=function(){q(c)}});else{if(c===d)throw new TypeError("Promise can't be resolved w/ itself");
+h(l.bind(c))}}catch(R){n(R)}}}function h(a){function b(b){return function(a){0<c++||b(a)}}var c=0,d=b(n);try{a(b(l),d)}catch(w){d(w)}}if(!(this instanceof A))throw Error("Promise must be called with `new`");if("function"!==typeof a)throw new TypeError("executor must be a function");var d=this,g=[],m=[],l=c(g,!0),n=c(m,!1),p=d._instance={resolvers:g,rejectors:m},k="function"===typeof setImmediate?setImmediate:setTimeout;h(a)};A.prototype.then=function(a,c){function h(a,c,h,l){c.push(function(b){if("function"!==
+typeof a)h(b);else try{g(a(b))}catch(C){m&&m(C)}});"function"===typeof d.retry&&l===d.state&&d.retry()}var d=this._instance,g,m,l=new A(function(a,c){g=a;m=c});h(a,d.resolvers,g,!0);h(c,d.rejectors,m,!1);return l};A.prototype["catch"]=function(a){return this.then(null,a)};A.resolve=function(a){return a instanceof A?a:new A(function(c){c(a)})};A.reject=function(a){return new A(function(c,h){h(a)})};A.all=function(a){return new A(function(c,h){var d=a.length,g=0,m=[];if(0===a.length)c([]);else for(var l=
+0;l<a.length;l++)(function(l){function p(a){g++;m[l]=a;g===d&&c(m)}null==a[l]||"object"!==typeof a[l]&&"function"!==typeof a[l]||"function"!==typeof a[l].then?p(a[l]):a[l].then(p,h)})(l)})};A.race=function(a){return new A(function(c,h){for(var d=0;d<a.length;d++)a[d].then(c,h)})};"undefined"===typeof D&&("undefined"!==typeof window?window.Promise=A:"undefined"!==typeof global&&(global.Promise=A));var G="undefined"!==typeof D?D:A,H=function(a){function c(a,d){if(d instanceof Array)for(var g=0;g<d.length;g++)c(a+
 "["+g+"]",d[g]);else if("[object Object]"===Object.prototype.toString.call(d))for(g in d)c(a+"["+g+"]",d[g]);else h.push(encodeURIComponent(a)+(null!=d&&""!==d?"="+encodeURIComponent(d):""))}if("[object Object]"!==Object.prototype.toString.call(a))return"";var h=[],d;for(d in a)c(d,a[d]);return h.join("&")},K=function(a,c){function h(){function b(){0===--a&&"function"===typeof t&&t()}var a=0;return function w(c){var d=c.then;c.then=function(){a++;var g=d.apply(c,arguments);g.then(b,function(c){b();
 if(0===a)throw c;});return w(g)};return c}}function d(b,a){if("string"===typeof b){var c=b;b=a||{};null==b.url&&(b.url=c)}return b}function g(b,a){if(null==a)return b;for(var c=b.match(/:[^\/]+/gi)||[],d=0;d<c.length;d++){var g=c[d].slice(1);null!=a[g]&&(b=b.replace(c[d],a[g]),delete a[g])}return b}function m(a,c){var b=H(c);if(""!==b){var d=0>a.indexOf("?")?"?":"&";a+=d+b}return a}function l(a){try{return""!==a?JSON.parse(a):null}catch(C){throw Error(a);}}function n(a){return a.responseText}function p(a,
 c){if("function"===typeof a)if(c instanceof Array)for(var b=0;b<c.length;b++)c[b]=new a(c[b]);else return new a(c);return c}var k=0,t;return{request:function(b,k){var t=h();b=d(b,k);var w=new c(function(c,d){null==b.method&&(b.method="GET");b.method=b.method.toUpperCase();var h="boolean"===typeof b.useBody?b.useBody:"GET"!==b.method&&"TRACE"!==b.method;"function"!==typeof b.serialize&&(b.serialize="undefined"!==typeof FormData&&b.data instanceof FormData?function(a){return a}:JSON.stringify);"function"!==
 typeof b.deserialize&&(b.deserialize=l);"function"!==typeof b.extract&&(b.extract=n);b.url=g(b.url,b.data);h?b.data=b.serialize(b.data):b.url=m(b.url,b.data);var k=new a.XMLHttpRequest;k.open(b.method,b.url,"boolean"===typeof b.async?b.async:!0,"string"===typeof b.user?b.user:void 0,"string"===typeof b.password?b.password:void 0);b.serialize===JSON.stringify&&h&&k.setRequestHeader("Content-Type","application/json; charset=utf-8");b.deserialize===l&&k.setRequestHeader("Accept","application/json, text/*");
 b.withCredentials&&(k.withCredentials=b.withCredentials);"function"===typeof b.config&&(k=b.config(k,b)||k);k.onreadystatechange=function(){if(4===k.readyState)try{var a=b.extract!==n?b.extract(k,b):b.deserialize(b.extract(k,b));if(200<=k.status&&300>k.status||304===k.status)c(p(b.type,a));else{var g=Error(k.responseText),h;for(h in a)g[h]=a[h];d(g)}}catch(E){d(E)}};h&&null!=b.data?k.send(b.data):k.send()});return!0===b.background?w:t(w)},jsonp:function(b,l){var n=h();b=d(b,l);var t=new c(function(c,
 d){var h=b.callbackName||"_mithril_"+Math.round(1E16*Math.random())+"_"+k++,l=a.document.createElement("script");a[h]=function(d){l.parentNode.removeChild(l);c(p(b.type,d));delete a[h]};l.onerror=function(){l.parentNode.removeChild(l);d(Error("JSONP request failed"));delete a[h]};null==b.data&&(b.data={});b.url=g(b.url,b.data);b.data[b.callbackKey||"callback"]=h;l.src=m(b.url,b.data);a.document.documentElement.appendChild(l)});return!0===b.background?t:n(t)},setCompletionCallback:function(a){t=a}}}(window,
-G),O=function(a){function c(e,f,a,b,c,d,g){for(;a<b;a++){var r=f[a];null!=r&&p(e,h(r,c,g),d)}}function h(e,f,a){var r=e.tag;null!=e.attrs&&A(e.attrs,e,f);if("string"===typeof r)switch(r){case "#":return e.dom=y.createTextNode(e.children);case "<":return d(e);case "[":var b=y.createDocumentFragment();null!=e.children&&(r=e.children,c(b,r,0,r.length,f,null,a));e.dom=b.firstChild;e.domSize=b.childNodes.length;return b;default:var g=e.tag;switch(e.tag){case "svg":a="http://www.w3.org/2000/svg";break;
+G),O=function(a){function c(e,f,a,b,c,d,g){for(;a<b;a++){var r=f[a];null!=r&&p(e,h(r,c,g),d)}}function h(e,f,a){var r=e.tag;null!=e.attrs&&z(e.attrs,e,f);if("string"===typeof r)switch(r){case "#":return e.dom=y.createTextNode(e.children);case "<":return d(e);case "[":var b=y.createDocumentFragment();null!=e.children&&(r=e.children,c(b,r,0,r.length,f,null,a));e.dom=b.firstChild;e.domSize=b.childNodes.length;return b;default:var g=e.tag;switch(e.tag){case "svg":a="http://www.w3.org/2000/svg";break;
 case "math":a="http://www.w3.org/1998/Math/MathML"}var p=(r=e.attrs)&&r.is,g=a?p?y.createElementNS(a,g,{is:p}):y.createElementNS(a,g):p?y.createElement(g,{is:p}):y.createElement(g);e.dom=g;if(null!=r)for(b in p=a,r)w(e,b,null,r[b],p);null!=e.attrs&&null!=e.attrs.contenteditable?k(e):(null!=e.text&&(""!==e.text?g.textContent=e.text:e.children=[u("#",void 0,void 0,e.text,void 0,void 0)]),null!=e.children&&(b=e.children,c(g,b,0,b.length,f,null,a),f=e.attrs,"select"===e.tag&&null!=f&&("value"in f&&w(e,
-"value",null,f.value,void 0),"selectedIndex"in f&&w(e,"selectedIndex",null,f.selectedIndex,void 0))));return g}else{e.state||(e.state={});S(e.state,e.tag);b=e.tag.view;if(null!=b.reentrantLock)e=D;else if(b.reentrantLock=!0,A(e.tag,e,f),e.instance=u.normalize(b.call(e.state,e)),b.reentrantLock=null,null!=e.instance){if(e.instance===e)throw Error("A view cannot return the vnode it received as arguments");f=h(e.instance,f,a);e.dom=e.instance.dom;e.domSize=null!=e.dom?e.instance.domSize:0;e=f}else e.domSize=
+"value",null,f.value,void 0),"selectedIndex"in f&&w(e,"selectedIndex",null,f.selectedIndex,void 0))));return g}else{e.state||(e.state={});S(e.state,e.tag);b=e.tag.view;if(null!=b.reentrantLock)e=D;else if(b.reentrantLock=!0,z(e.tag,e,f),e.instance=u.normalize(b.call(e.state,e)),b.reentrantLock=null,null!=e.instance){if(e.instance===e)throw Error("A view cannot return the vnode it received as arguments");f=h(e.instance,f,a);e.dom=e.instance.dom;e.domSize=null!=e.dom?e.instance.domSize:0;e=f}else e.domSize=
 0,e=D;return e}}function d(e){var f={caption:"table",thead:"table",tbody:"table",tfoot:"table",tr:"tbody",th:"tr",td:"tr",colgroup:"table",col:"colgroup"}[(e.children.match(/^\s*?<(\w+)/im)||[])[1]]||"div",f=y.createElement(f);f.innerHTML=e.children;e.dom=f.firstChild;e.domSize=f.childNodes.length;e=y.createDocumentFragment();for(var a;a=f.firstChild;)e.appendChild(a);return e}function g(e,f,a,b,d,g){if(f!==a&&(null!=f||null!=a))if(null==f)c(e,a,0,a.length,b,d,void 0);else if(null==a)t(f,0,f.length,
 a);else{if(f.length===a.length){for(var r=!1,k=0;k<a.length;k++)if(null!=a[k]&&null!=f[k]){r=null==a[k].key&&null==f[k].key;break}if(r){for(k=0;k<f.length;k++)f[k]!==a[k]&&(null==f[k]&&null!=a[k]?p(e,h(a[k],b,g),n(f,k+1,d)):null==a[k]?t(f,k,k+1,a):m(e,f[k],a[k],b,n(f,k+1,d),!1,g));return}}a:{if(null!=f.pool&&Math.abs(f.pool.length-a.length)<=Math.abs(f.length-a.length)&&(r=a[0]&&a[0].children&&a[0].children.length||0,Math.abs((f.pool[0]&&f.pool[0].children&&f.pool[0].children.length||0)-r)<=Math.abs((f[0]&&
 f[0].children&&f[0].children.length||0)-r))){r=!0;break a}r=!1}r&&(f=f.concat(f.pool));for(var B=k=0,x=f.length-1,w=a.length-1,C;x>=k&&w>=B;){var v=f[k],q=a[B];if(v!==q||r)if(null==v)k++;else if(null==q)B++;else if(v.key===q.key)k++,B++,m(e,v,q,b,n(f,k,d),r,g),r&&v.tag===q.tag&&p(e,l(v),d);else if(v=f[x],v!==q||r)if(null==v)x--;else if(null==q)B++;else if(v.key===q.key)m(e,v,q,b,n(f,x+1,d),r,g),(r||B<w)&&p(e,l(v),n(f,k,d)),x--,B++;else break;else x--,B++;else k++,B++}for(;x>=k&&w>=B;){v=f[x];q=a[w];
 if(v!==q||r)if(null==v)x--;else{if(null!=q)if(v.key===q.key)m(e,v,q,b,n(f,x+1,d),r,g),r&&v.tag===q.tag&&p(e,l(v),d),null!=v.dom&&(d=v.dom),x--;else{if(!C){C=f;var v=x,y={},F;for(F=0;F<v;F++){var u=C[F];null!=u&&(u=u.key,null!=u&&(y[u]=F))}C=y}null!=q&&(v=C[q.key],null!=v?(y=f[v],m(e,y,q,b,n(f,x+1,d),r,g),p(e,l(y),d),f[v].skip=!0,null!=y.dom&&(d=y.dom)):(q=h(q,b,void 0),p(e,q,d),d=q))}w--}else x--,w--;if(w<B)break}c(e,a,B,w+1,b,d,g);t(f,k,x+1,a)}}function m(a,f,b,c,q,x,n){var e=f.tag;if(e===b.tag){b.state=
 f.state;b.events=f.events;var r;var B;null!=b.attrs&&"function"===typeof b.attrs.onbeforeupdate&&(r=b.attrs.onbeforeupdate.call(b.state,b,f));"string"!==typeof b.tag&&"function"===typeof b.tag.onbeforeupdate&&(B=b.tag.onbeforeupdate.call(b.state,b,f));void 0===r&&void 0===B||r||B?r=!1:(b.dom=f.dom,b.domSize=f.domSize,b.instance=f.instance,r=!0);if(!r)if(null!=b.attrs&&N(b.attrs,b,c,x),"string"===typeof e)switch(e){case "#":f.children.toString()!==b.children.toString()&&(f.dom.nodeValue=b.children);
 b.dom=f.dom;break;case "<":f.children!==b.children?(l(f),p(a,d(b),q)):(b.dom=f.dom,b.domSize=f.domSize);break;case "[":g(a,f.children,b.children,c,q,n);f=0;c=b.children;b.dom=null;if(null!=c){for(var t=0;t<c.length;t++)a=c[t],null!=a&&null!=a.dom&&(null==b.dom&&(b.dom=a.dom),f+=a.domSize||1);1!==f&&(b.domSize=f)}break;default:a=n;q=b.dom=f.dom;switch(b.tag){case "svg":a="http://www.w3.org/2000/svg";break;case "math":a="http://www.w3.org/1998/Math/MathML"}"textarea"===b.tag&&(null==b.attrs&&(b.attrs=
-{}),null!=b.text&&(b.attrs.value=b.text,b.text=void 0));x=f.attrs;n=b.attrs;e=a;if(null!=n)for(t in n)w(b,t,x&&x[t],n[t],e);if(null!=x)for(t in x)null!=n&&t in n||("className"===t&&(t="class"),"o"!==t[0]||"n"!==t[1]||M(t)?"key"!==t&&b.dom.removeAttribute(t):z(b,t,void 0));null!=b.attrs&&null!=b.attrs.contenteditable?k(b):null!=f.text&&null!=b.text&&""!==b.text?f.text.toString()!==b.text.toString()&&(f.dom.firstChild.nodeValue=b.text):(null!=f.text&&(f.children=[u("#",void 0,void 0,f.text,void 0,f.dom.firstChild)]),
+{}),null!=b.text&&(b.attrs.value=b.text,b.text=void 0));x=f.attrs;n=b.attrs;e=a;if(null!=n)for(t in n)w(b,t,x&&x[t],n[t],e);if(null!=x)for(t in x)null!=n&&t in n||("className"===t&&(t="class"),"o"!==t[0]||"n"!==t[1]||M(t)?"key"!==t&&b.dom.removeAttribute(t):A(b,t,void 0));null!=b.attrs&&null!=b.attrs.contenteditable?k(b):null!=f.text&&null!=b.text&&""!==b.text?f.text.toString()!==b.text.toString()&&(f.dom.firstChild.nodeValue=b.text):(null!=f.text&&(f.children=[u("#",void 0,void 0,f.text,void 0,f.dom.firstChild)]),
 null!=b.text&&(b.children=[u("#",void 0,void 0,b.text,void 0,void 0)]),g(q,f.children,b.children,c,null,a))}else b.instance=u.normalize(b.tag.view.call(b.state,b)),N(b.tag,b,c,x),null!=b.instance?(null==f.instance?p(a,h(b.instance,c,n),q):m(a,f.instance,b.instance,c,q,x,n),b.dom=b.instance.dom,b.domSize=b.instance.domSize):null!=f.instance?(C(f.instance,null),b.dom=void 0,b.domSize=0):(b.dom=f.dom,b.domSize=f.domSize)}else C(f,null),p(a,h(b,c,n),q)}function l(b){var a=b.domSize;if(null!=a||null==
 b.dom){var e=y.createDocumentFragment();if(0<a){for(b=b.dom;--a;)e.appendChild(b.nextSibling);e.insertBefore(b,e.firstChild)}return e}return b.dom}function n(b,a,c){for(;a<b.length;a++)if(null!=b[a]&&null!=b[a].dom)return b[a].dom;return c}function p(b,a,c){c&&c.parentNode?b.insertBefore(a,c):b.appendChild(a)}function k(b){var a=b.children;if(null!=a&&1===a.length&&"<"===a[0].tag)a=a[0].children,b.dom.innerHTML!==a&&(b.dom.innerHTML=a);else if(null!=b.text||null!=a&&0!==a.length)throw Error("Child node of a contenteditable must be trusted");
 }function t(b,a,c,d){for(;a<c;a++){var e=b[a];null!=e&&(e.skip?e.skip=!1:C(e,d))}}function b(b){var a=!1;return function(){a||(a=!0,b())}}function C(a,f){function e(){if(++d===c&&(q(a),a.dom)){var b=a.domSize||1;if(1<b)for(var e=a.dom;--b;){var g=e.nextSibling,k=g.parentNode;null!=k&&k.removeChild(g)}b=a.dom;e=b.parentNode;null!=e&&e.removeChild(b);if(b=null!=f&&null==a.domSize)b=a.attrs,b=!(null!=b&&(b.oncreate||b.onupdate||b.onbeforeremove||b.onremove));b&&"string"===typeof a.tag&&(f.pool?f.pool.push(a):
 f.pool=[a])}}var c=1,d=0;a.attrs&&a.attrs.onbeforeremove&&(c++,a.attrs.onbeforeremove.call(a.state,a,b(e)));"string"!==typeof a.tag&&a.tag.onbeforeremove&&(c++,a.tag.onbeforeremove.call(a.state,a,b(e)));e()}function q(a){a.attrs&&a.attrs.onremove&&a.attrs.onremove.call(a.state,a);"string"!==typeof a.tag&&a.tag.onremove&&a.tag.onremove.call(a.state,a);if(null!=a.instance)q(a.instance);else if(a=a.children,a instanceof Array)for(var b=0;b<a.length;b++){var e=a[b];null!=e&&q(e)}}function w(a,b,c,d,g){var e=
-a.dom;if("key"!==b&&"is"!==b&&(c!==d||"value"===b||"checked"===b||"selectedIndex"===b||"selected"===b&&a.dom===y.activeElement||"object"===typeof d)&&"undefined"!==typeof d&&!M(b)){var f=b.indexOf(":");if(-1<f&&"xlink"===b.substr(0,f))e.setAttributeNS("http://www.w3.org/1999/xlink",b.slice(f+1),d);else if("o"===b[0]&&"n"===b[1]&&"function"===typeof d)z(a,b,d);else if("style"===b)if(a=c,a===d&&(e.style.cssText="",a=null),null==d)e.style.cssText="";else if("string"===typeof d)e.style.cssText=d;else{"string"===
+a.dom;if("key"!==b&&"is"!==b&&(c!==d||"value"===b||"checked"===b||"selectedIndex"===b||"selected"===b&&a.dom===y.activeElement||"object"===typeof d)&&"undefined"!==typeof d&&!M(b)){var f=b.indexOf(":");if(-1<f&&"xlink"===b.substr(0,f))e.setAttributeNS("http://www.w3.org/1999/xlink",b.slice(f+1),d);else if("o"===b[0]&&"n"===b[1]&&"function"===typeof d)A(a,b,d);else if("style"===b)if(a=c,a===d&&(e.style.cssText="",a=null),null==d)e.style.cssText="";else if("string"===typeof d)e.style.cssText=d;else{"string"===
 typeof a&&(e.style.cssText="");for(var k in d)e.style[k]=d[k];if(null!=a&&"string"!==typeof a)for(k in a)k in d||(e.style[k]="")}else b in e&&"href"!==b&&"list"!==b&&"form"!==b&&"width"!==b&&"height"!==b&&void 0===g&&!(a.attrs.is||-1<a.tag.indexOf("-"))?"input"===a.tag&&"value"===b&&a.dom.value===d&&a.dom===y.activeElement||"select"===a.tag&&"value"===b&&a.dom.value===d&&a.dom===y.activeElement||"option"===a.tag&&"value"===b&&a.dom.value===d||(e[b]=d):"boolean"===typeof d?d?e.setAttribute(b,""):e.removeAttribute(b):
-e.setAttribute("className"===b?"class":b,d)}}function M(a){return"oninit"===a||"oncreate"===a||"onupdate"===a||"onremove"===a||"onbeforeremove"===a||"onbeforeupdate"===a}function z(a,b,c){var d=a.dom,e="function"!==typeof E?c:function(a){var b=c.call(d,a);E.call(d,a);return b};if(b in d)d[b]="function"===typeof c?e:null;else{var f=b.slice(2);void 0===a.events&&(a.events={});a.events[b]!==e&&(null!=a.events[b]&&d.removeEventListener(f,a.events[b],!1),"function"===typeof c&&(a.events[b]=e,d.addEventListener(f,
-a.events[b],!1)))}}function A(a,b,c){"function"===typeof a.oninit&&a.oninit.call(b.state,b);"function"===typeof a.oncreate&&c.push(a.oncreate.bind(b.state,b))}function N(a,b,c,d){d?A(a,b,c):"function"===typeof a.onupdate&&c.push(a.onupdate.bind(b.state,b))}function S(a,b){Object.keys(b).forEach(function(c){a[c]=b[c]})}var y=a.document,D=y.createDocumentFragment(),E;return{render:function(a,b){if(!a)throw Error("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.");var c=
+e.setAttribute("className"===b?"class":b,d)}}function M(a){return"oninit"===a||"oncreate"===a||"onupdate"===a||"onremove"===a||"onbeforeremove"===a||"onbeforeupdate"===a}function A(a,b,c){var d=a.dom,e="function"!==typeof E?c:function(a){var b=c.call(d,a);E.call(d,a);return b};if(b in d)d[b]="function"===typeof c?e:null;else{var f=b.slice(2);void 0===a.events&&(a.events={});a.events[b]!==e&&(null!=a.events[b]&&d.removeEventListener(f,a.events[b],!1),"function"===typeof c&&(a.events[b]=e,d.addEventListener(f,
+a.events[b],!1)))}}function z(a,b,c){"function"===typeof a.oninit&&a.oninit.call(b.state,b);"function"===typeof a.oncreate&&c.push(a.oncreate.bind(b.state,b))}function N(a,b,c,d){d?z(a,b,c):"function"===typeof a.onupdate&&c.push(a.onupdate.bind(b.state,b))}function S(a,b){Object.keys(b).forEach(function(c){a[c]=b[c]})}var y=a.document,D=y.createDocumentFragment(),E;return{render:function(a,b){if(!a)throw Error("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.");var c=
 [],d=y.activeElement;null==a.vnodes&&(a.textContent="");b instanceof Array||(b=[b]);g(a,a.vnodes,u.normalizeChildren(b),c,null,void 0);a.vnodes=b;for(var e=0;e<c.length;e++)c[e]();y.activeElement!==d&&d.focus()},setEventCallback:function(a){return E=a}}},I=function(a){function c(a){a=d.indexOf(a);-1<a&&d.splice(a,2)}function h(){for(var a=1;a<d.length;a+=2)d[a]()}a=O(a);a.setEventCallback(function(a){!1!==a.redraw&&h()});var d=[];return{subscribe:function(a,h){c(a);d.push(a,Q(h))},unsubscribe:c,redraw:h,
-render:a.render}}(window);K.setCompletionCallback(I.redraw);A.mount=function(a){return function(c,h){if(null===h)a.render(c,[]),a.unsubscribe(c);else{if(null==h.view)throw Error("m.mount(element, component) expects a component, not a vnode");a.subscribe(c,function(){a.render(c,u(h))});a.redraw()}}}(I);var D=G,L=function(a){if(""===a||null==a)return{};"?"===a.charAt(0)&&(a=a.slice(1));a=a.split("&");for(var c={},h={},d=0;d<a.length;d++){var g=a[d].split("="),m=decodeURIComponent(g[0]),g=2===g.length?
+render:a.render}}(window);K.setCompletionCallback(I.redraw);z.mount=function(a){return function(c,h){if(null===h)a.render(c,[]),a.unsubscribe(c);else{if(null==h.view)throw Error("m.mount(element, component) expects a component, not a vnode");a.subscribe(c,function(){a.render(c,u(h))});a.redraw()}}}(I);var D=G,L=function(a){if(""===a||null==a)return{};"?"===a.charAt(0)&&(a=a.slice(1));a=a.split("&");for(var c={},h={},d=0;d<a.length;d++){var g=a[d].split("="),m=decodeURIComponent(g[0]),g=2===g.length?
 decodeURIComponent(g[1]):"";"true"===g?g=!0:"false"===g&&(g=!1);var l=m.split(/\]\[?|\[/),n=c;-1<m.indexOf("[")&&l.pop();for(var p=0;p<l.length;p++){var m=l[p],k=l[p+1],k=""==k||!isNaN(parseInt(k,10)),t=p===l.length-1;""===m&&(m=l.slice(0,p).join(),null==h[m]&&(h[m]=0),m=h[m]++);null==n[m]&&(n[m]=t?g:k?[]:{});n=n[m]}}return c},T=function(a){function c(c){var d=a.location[c].replace(/(?:%[a-f89][a-f0-9])+/gim,decodeURIComponent);"pathname"===c&&"/"!==d[0]&&(d="/"+d);return d}function h(a){return function(){null==
 l&&(l=m(function(){l=null;a()}))}}function d(a,c,d){var b=a.indexOf("?"),g=a.indexOf("#"),k=-1<b?b:-1<g?g:a.length;if(-1<b){var b=L(a.slice(b+1,-1<g?g:a.length)),h;for(h in b)c[h]=b[h]}if(-1<g)for(h in c=L(a.slice(g+1)),c)d[h]=c[h];return a.slice(0,k)}var g="function"===typeof a.history.pushState,m="function"===typeof setImmediate?setImmediate:setTimeout,l,n={prefix:"#!",getPath:function(){switch(n.prefix.charAt(0)){case "#":return c("hash").slice(n.prefix.length);case "?":return c("search").slice(n.prefix.length)+
 c("hash");default:return c("pathname").slice(n.prefix.length)+c("search")+c("hash")}},setPath:function(c,k,h){var b={},l={};c=d(c,b,l);if(null!=k){for(var q in k)b[q]=k[q];c=c.replace(/:([^\/]+)/g,function(a,c){delete b[c];return k[c]})}(q=H(b))&&(c+="?"+q);(l=H(l))&&(c+="#"+l);g?(l=h?h.state:null,q=h?h.title:null,a.onpopstate(),h&&h.replace?a.history.replaceState(l,q,n.prefix+c):a.history.pushState(l,q,n.prefix+c)):a.location.href=n.prefix+c},defineRoutes:function(c,k,l){function b(){var b=n.getPath(),
-g={},h=d(b,g,g),m=a.history.state;if(null!=m)for(var t in m)g[t]=m[t];for(var p in c)if(m=new RegExp("^"+p.replace(/:[^\/]+?\.{3}/g,"(.*?)").replace(/:[^\/]+/g,"([^\\/]+)")+"/?$"),m.test(h)){h.replace(m,function(){for(var a=p.match(/:[^\/]+/g)||[],d=[].slice.call(arguments,1,-2),h=0;h<a.length;h++)g[a[h].replace(/:|\./g,"")]=decodeURIComponent(d[h]);k(c[p],g,b,p)});return}l(b,g)}g?a.onpopstate=h(b):"#"===n.prefix.charAt(0)&&(a.onhashchange=b);b()}};return n};A.route=function(a,c){var h=T(a),d=function(a){return a},
-g,m,l,n,p,k=function(a,b,k){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");var q=function(){null!=g&&c.render(a,g(u(m,l.key,l)))},t=function(){h.setPath(b)};h.defineRoutes(k,function(a,b,c){var h=p=function(a,k){h===p&&(m=null!=k&&"function"===typeof k.view?k:"div",l=b,n=c,p=null,g=(a.render||d).bind(a),q())};a.view?h({},a):a.onmatch?D.resolve(a.onmatch(b,c)).then(function(b){h(a,b)},t):h(a,"div")},t);c.subscribe(a,q)};k.set=function(a,b,c){null!=p&&
-(c={replace:!0});p=null;h.setPath(a,b,c)};k.get=function(){return n};k.prefix=function(a){h.prefix=a};k.link=function(a){a.dom.setAttribute("href",h.prefix+a.attrs.href);a.dom.onclick=function(a){a.ctrlKey||a.metaKey||a.shiftKey||2===a.which||(a.preventDefault(),a.redraw=!1,a=this.getAttribute("href"),0===a.indexOf(h.prefix)&&(a=a.slice(h.prefix.length)),k.set(a,void 0,void 0))}};return k}(window,I);A.withAttr=function(a,c,h){return function(d){return c.call(h||this,a in d.currentTarget?d.currentTarget[a]:
-d.currentTarget.getAttribute(a))}};G=O(window);A.render=G.render;A.redraw=I.redraw;A.request=K.request;A.jsonp=K.jsonp;A.parseQueryString=L;A.buildQueryString=H;A.version="1.0.0-rc.6";"undefined"!==typeof module?module.exports=A:window.m=A};
\ No newline at end of file
+g={},h=d(b,g,g),m=a.history.state;if(null!=m)for(var t in m)g[t]=m[t];for(var p in c)if(m=new RegExp("^"+p.replace(/:[^\/]+?\.{3}/g,"(.*?)").replace(/:[^\/]+/g,"([^\\/]+)")+"/?$"),m.test(h)){h.replace(m,function(){for(var a=p.match(/:[^\/]+/g)||[],d=[].slice.call(arguments,1,-2),h=0;h<a.length;h++)g[a[h].replace(/:|\./g,"")]=decodeURIComponent(d[h]);k(c[p],g,b,p)});return}l(b,g)}g?a.onpopstate=h(b):"#"===n.prefix.charAt(0)&&(a.onhashchange=b);b()}};return n};z.route=function(a,c){var h=T(a),d=function(a){return a},
+g,m,l,n,p,k=function(a,b,k){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");var q=function(){null!=g&&c.render(a,g(u(m,l.key,l)))},t=function(){h.setPath(b,null,{replace:!0})};h.defineRoutes(k,function(a,b,c){var h=p=function(a,k){h===p&&(m=null!=k&&"function"===typeof k.view?k:"div",l=b,n=c,p=null,g=(a.render||d).bind(a),q())};a.view?h({},a):a.onmatch?D.resolve(a.onmatch(b,c)).then(function(b){h(a,b)},t):h(a,"div")},t);c.subscribe(a,q)};k.set=function(a,
+b,c){null!=p&&(c={replace:!0});p=null;h.setPath(a,b,c)};k.get=function(){return n};k.prefix=function(a){h.prefix=a};k.link=function(a){a.dom.setAttribute("href",h.prefix+a.attrs.href);a.dom.onclick=function(a){a.ctrlKey||a.metaKey||a.shiftKey||2===a.which||(a.preventDefault(),a.redraw=!1,a=this.getAttribute("href"),0===a.indexOf(h.prefix)&&(a=a.slice(h.prefix.length)),k.set(a,void 0,void 0))}};return k}(window,I);z.withAttr=function(a,c,h){return function(d){return c.call(h||this,a in d.currentTarget?
+d.currentTarget[a]:d.currentTarget.getAttribute(a))}};G=O(window);z.render=G.render;z.redraw=I.redraw;z.request=K.request;z.jsonp=K.jsonp;z.parseQueryString=L;z.buildQueryString=H;z.version="1.0.0-rc.6";z.vnode=u;"undefined"!==typeof module?module.exports=z:window.m=z};
\ No newline at end of file
diff --git a/ospec/README.md b/ospec/README.md
index 0d116ec6..cd08c697 100644
--- a/ospec/README.md
+++ b/ospec/README.md
@@ -4,7 +4,7 @@
 
 Noiseless testing framework
 
-Version: 1.2 
+Version: 1.2.1 
 License: MIT
 
 ## About
diff --git a/ospec/package.json b/ospec/package.json
index 78fffa34..940b7f5a 100644
--- a/ospec/package.json
+++ b/ospec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ospec",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Noiseless testing framework",
   "main": "ospec.js",
   "directories": {