diff --git a/head.js b/head.js
index ca021fb..48c4df3 100644
--- a/head.js
+++ b/head.js
@@ -7,47 +7,59 @@
 (function(doc) {
 	
 	var html = doc.documentElement,
-	 	conf = {
+		conf = {
 			screens: [320, 480, 640, 768, 1024, 1280, 1440, 1680, 1920],
 			section: "-section",
 			page: "-page",
 			head: "head"
-		};
+		},
+		klass = [];
 		
 	if (typeof window.head_conf == 'object') {
 		for (var key in head_conf) {
-			conf[key] = head_conf[key];
+			if (head_conf[key]) {
+				conf[key] = head_conf[key];
+			}
 		}
 	} 
 	
 	window.head_conf = conf;
 		
-	function addClass(name) { 
-		html.className += ' ' + name; 
+	function pushClass(name) {
+		klass.push(name); 
 	} 
 	
 	function removeClass(name) {
 		var re = new RegExp("\\b" + name + "\\b");
-		html.className = html.className.replace(re, ''); 
+		html.className = html.className.replace(re, '');
 	}
 
 	function each(arr, fn) {	
-		for (var i = 0; i < arr.length; i++)
+		for (var i = 0; i < arr.length; i++) {
 			fn.call(arr, arr[i], i);
+		}
 	}
 	
 	// API	 
 	var api = window[conf.head] = function() {
 		api.ready.apply(null, arguments);
-	};	
+	}; 
 
-	api.feature = function(key, enabled) {
-		removeClass('no-' + key);
-		removeClass(key);
-		addClass((enabled ? '' : 'no-') + key);
+	api.feature = function(key, enabled, queue) {
+		
+		/*% internal %*/
+		  if (!key) { 
+				html.className += ' ' + klass.join( ' ' );
+				klass = [];		  
+		  } else if (!queue) { 
+				removeClass('no-' + key); removeClass(key); 
+		  }
+		/*% endinternal %*/
+		
+		pushClass((enabled ? '' : 'no-') + key);
 		api[key] = !!enabled;
 		return api;
-	};	
+	}; 
 	
 	// browser type & version
 	var ua = navigator.userAgent.toLowerCase();
@@ -57,19 +69,19 @@
 		/(msie) ([\w.]+)/.exec( ua ) ||
 		!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || [];
 		
-	if (ua[1] == 'msie') ua[1] = 'ie';
-	addClass(ua[1]);
-	// addClass(ua[1] + ua[2].replace(/\./g, "").substring(0, 3));
+	if (ua[1] == 'msie') { ua[1] = 'ie'; }
+	pushClass(ua[1]);
+	// pushClass(ua[1] + ua[2].replace(/\./g, "").substring(0, 3));
 	
 	api.browser = { version: ua[2] };
-	api.browser[ua[1]] = true;	
+	api.browser[ua[1]] = true; 
 	
 	// IE specific
 	if (api.browser.ie) {
 		
 		// IE versions
 		for (var ver = 3; ver < 11; ver++) {
-			if (parseFloat(ua[2]) < ver) { addClass("lt-ie" + ver); } 			
+			if (parseFloat(ua[2]) < ver) { pushClass("lt-ie" + ver); }			
 		}
 	} 
 	
@@ -89,9 +101,9 @@
 	
 	
 	api.section = section;	
-	api.pageId = pageId;	
+	api.pageId = pageId; 
 
-	addClass(section + conf.section);
+	pushClass(section + conf.section);
 	html.id = pageId + conf.page;
 	
 	
@@ -99,28 +111,29 @@
 	function screenSize() {
 		var w = document.width || window.outerWidth || document.documentElement.clientWidth;
 		
-		// remove earlier screens
+		// remove earlier widths
 		html.className = html.className.replace(/ (w|lt)-\d+/g, "");
-		addClass("w-" + Math.round(w / 100) * 100);
+		
+		// add new ones
+		pushClass("w-" + Math.round(w / 100) * 100);
 		
 		each(conf.screens, function(width) {
-			if (w <= width) { addClass("lt-" + width); } 
-		})
+			if (w <= width) { pushClass("lt-" + width); } 
+		});
 	}
 	
-	screenSize();	 	
-	window.onresize = screenSize;	
-	
-	head.feature("script", true);
-
+	screenSize();		
+	window.onresize = screenSize;
 	
+	api.feature("script", true).feature();
+		
 })(document);
 
 
-(function(doc) {
+(function(api) {
 		
 	/* CSS modernizer */
-	var el = doc.createElement("i"),
+	var el = document.createElement("i"),
 		 style = el.style,
 		 prefs = ' -o- -moz- -ms- -webkit- -khtml- '.split(' ');
 		 
@@ -189,17 +202,25 @@
 		}
       
 	};
-
-	var api = window[head_conf.head];
-		
+	
+	// queue features	
 	for (var key in tests) {		
-		api.feature(key, tests[key].call());
+		if (tests[key]) {
+			api.feature(key, tests[key].call(), true);
+		}
 	}
 	
-})(document);	
+	// enable features at once
+	api.feature();
+	
+	
+})(window[head_conf.head]);	
+
+
 (function(doc) { 
 		
-	var ready = false,
+	var head = doc.documentElement,
+		 ready = false,
 		 queue = [],
 		 thelast = [],		// functions to be executed last
 		 waiters = {},		// functions waiting for scripts
@@ -217,16 +238,17 @@
 			next = rest[0];				 
 			 
 		if (!ready) {
-			return queue.push(function()  {
+			queue.push(function()  {
 				api.js.apply(null, args);				
 			});
+			return api;
 		}
 		
 		// multiple arguments	 
 		if (next) {				
 			
 			// preload all immediately
-			if (!isFunc(next)) preloadAll.apply(null, rest);
+			if (!isFunc(next)) { preloadAll.apply(null, rest); }
 		
 			// load all recursively in order
 			load(getScript(args[0]), isFunc(next) ? next : function() {	
@@ -235,10 +257,10 @@
 			
 		// single script	
 		} else {
-			load(getScript(args[0])); 	
+			load(getScript(args[0]));
 		}
 		
-		return api.js;		 
+		return api;		 
 	};
 		
 	api.ready = function(key, fn) {
@@ -248,25 +270,21 @@
 						
 		var arr = waiters[key];
 		if (!arr) { arr = waiters[key] = [fn]; }
-		else arr.push[fn];
-		return api.js;
-	};
-
-	/*
-	api.dump = function() {
-		console.info(scripts);
+		else { arr.push(fn); }
+		return api;
 	};
-	*/
 	
 	/*** private functions ***/
 	function getScript(url) {
 		
 		var script = scripts[url.url || url];
-		if (script) return script;
+		if (script) { return script; }
 		
 		if (typeof url == 'object')  {
 			for (var key in url) {
-				script = { name: key, url: url[key] };	
+				if (url[key]) {
+					script = { name: key, url: url[key] };
+				}
 			}
 		} else {
 			script = { name: url.substring(url.indexOf("/", 10) + 1, url.indexOf("?")), url: url }; 
@@ -277,14 +295,15 @@
 	}
 	
 	function each(arr, fn) {
-		if (!arr) return;
+		if (!arr) { return; }
 		
 		// arguments special type
 		if (typeof arr == 'object') { arr = [].slice.call(arr); }
 		
 		// do the job
-		for (var i = 0; i < arr.length; i++)
+		for (var i = 0; i < arr.length; i++) {
 			fn.call(arr, arr[i], i);
+		}
 	}
 	
 	function isFunc(el) {
@@ -299,23 +318,20 @@
 		});		
 	}
 	
+	function onPreload(script) {
+		script.state = "preloaded";
+
+		each(script.onpreload, function(el) {
+			el.call();
+		});					
+	}
+	
 	function preload(script, callback) {
 		
 		if (!script.state) {
 			
-			//* console.info("PRELOAD", script.name)
-			
 			script.state = "preloading";
 			script.onpreload = [];
-
-			function onload() {
-				script.state = "preloaded";
-				
-				//* console.info("    PRE", script.name);
-				each(script.onpreload, function(el) {
-					el.call();
-				});					
-			}
 			
 			/*
 				Browser detection required. Firefox does not support script.type = text/cache
@@ -328,24 +344,24 @@
 				obj.height = 0;		
 				
 				obj.onload = function() {
-					onload();
+					onPreload(script);
 					
 					// avoid spinning progress indicator with setTimeout
-					setTimeout(function() { doc.body.removeChild(obj); }, 1);
+					setTimeout(function() { head.removeChild(obj); }, 1);
 				};
 				
-				doc.body.appendChild(obj);
+				head.appendChild(obj);
 				
 			} else {
-				scriptTag({ src: script.url, type: 'cache'}, onload);	
-			}
-			
+				scriptTag({ src: script.url, type: 'cache'}, function()  {
+					onPreload(script);		
+				});
+			} 
 		}
 	}
 	
 	
-	function load(script, callback) {		
-
+	function load(script, callback) {	
 
 		if (script.state == 'loaded') { return callback(); }
 			
@@ -354,8 +370,6 @@
 				load(script, callback);	
 			});
 		}
-
-		//* console.info("LOAD", script.name, ":", script.state)
 		
 		script.state = 'loading'; 
 
@@ -363,9 +377,7 @@
 			
 			script.state = 'loaded';
 			
-			if (callback) callback.call();			
-			
-			//* console.info("    LOADED", script.name);
+			if (callback) { callback.call(); }			
 			
 			// waiters for this script
 			each(waiters[script.name], function(fn) {
@@ -376,12 +388,12 @@
 			var allLoaded = true;
 		
 			for (var key in scripts) {
-				if (scripts[key].state != 'loaded') allLoaded = false;	
+				if (scripts[key].state != 'loaded') { allLoaded = false; }	
 			}
 		
 			if (allLoaded) {
 				each(thelast, function(fn) {
-					if (!fn.done) fn.call();
+					if (!fn.done) { fn.call(); }
 					fn.done = true;
 				});
 			}
@@ -392,9 +404,7 @@
 	// if callback == true --> preload
 	function scriptTag(src, callback)  {
 		
-		var head = doc.getElementsByTagName('head')[0],
-			elem = doc.createElement('script');
-		
+		var elem = doc.createElement('script');		
 		elem.type = 'text/' + (src.type || 'javascript');
 		elem.src = src.src || src;
 		
@@ -413,13 +423,16 @@
 		head.appendChild(elem); 
 	} 
 	
-	// DomContentLoaded no better	 
+	/*
+		This timer delays the start a little. All just become more robust. 
+		Still a bit of a mystery. Will investigate report when all clear.		
+		Not related to DomContentLoaded.	 
+	*/	
 	setTimeout(function() {
 		ready = true;
 		each(queue, function(fn) {
 			fn.call();			
 		});		
-	}, 50);
-	
+	}, 200);	
 		
 })(document);
diff --git a/head.min.js b/head.min.js
index b34357c..0f259b2 100644
--- a/head.min.js
+++ b/head.min.js
@@ -4,4 +4,4 @@
 	copyright: "tipiirai" / Tero Piirainen
 	license: MIT
 */
-(function(a){var b=a.documentElement,c={screens:[320,480,640,768,1024,1280,1440,1680,1920],section:"-section",page:"-page",head:"head"};if(typeof window.head_conf=="object")for(var d in head_conf)c[d]=head_conf[d];window.head_conf=c;function e(a){b.className+=" "+a}function f(a){var c=new RegExp("\\b"+a+"\\b");b.className=b.className.replace(c,"")}function g(a,b){for(var c=0;c<a.length;c++)b.call(a,a[c],c)}var h=window[c.head]=function(){h.ready.apply(null,arguments)};h.feature=function(a,b){f("no-"+a),f(a),e((b?"":"no-")+a),h[a]=b;return h};var i=navigator.userAgent.toLowerCase();i=/(webkit)[ \/]([\w.]+)/.exec(i)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(i)||/(msie) ([\w.]+)/.exec(i)||!/compatible/.test(i)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(i)||[],i[1]=="msie"&&(i[1]="ie"),e(i[1]),h.browser={version:i[2]},h.browser[i[1]]=!0;if(h.browser.ie)for(var j=3;j<11;j++)parseFloat(i[2])<j&&e("lt-ie"+j);g("abbr|article|aside|audio|canvas|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video".split("|"),function(b){a.createElement(b)});var k=location.pathname,l=k.split("/"),m=l.slice(0,l.length-1).join("-")||"root",n=l.slice(-1)[0]||"index",o=n.indexOf(".");o>=0&&(n=n.substring(0,o)),h.section=m,h.pageId=n,e(m+c.section),b.id=n+c.page;function p(){var a=document.width||window.outerWidth||document.documentElement.clientWidth;b.className=b.className.replace(/ (w|lt)-\d+/g,""),e("w-"+Math.round(a/100)*100),g(c.screens,function(b){a<=b&&e("lt-"+b)})}p(),window.onresize=p,head.feature("script",!0)})(document),function(a){var b=a.createElement("i"),c=b.style,d=" -o- -moz- -ms- -webkit- -khtml- ".split(" ");function e(a){c.cssText=d.join(a+";");var b=c.cssText?c.cssText.length:0;return b>0&&!c.cssText.split(";")[1]}var f={gradient:function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(#fff));",e="linear-gradient(left top,#eee,#fff);";c.cssText=(a+d.join(b+a)+d.join(e+a)).slice(0,-a.length);return c.backgroundImage},rgba:function(){c.cssText="background-color:rgba(0,0,0,0.5)";return c.backgroundColor},boxshadow:function(){return e("box-shadow: 0 0 0 red")},textshadow:function(){return c.textShadow===""},multiplebgs:function(){c.cssText="background:url(//:),url(//:),red url(//:)";return(new RegExp("(url\\s*\\(.*?){3}")).test(c.background)},borderimage:function(){return e("border-image: url(m.png) 1 1 stretch")},borderradius:function(){return e("border-radius:0")},opacity:function(){return e("opacity:.1")},reflections:function(){return e("box-reflect:right 0")},transforms:function(){return e("transform:rotate(1deg)")},transitions:function(){return e("transition:all .1s linear")}},g=window[head_conf.head];for(var h in f)g.feature(h,f[h].call())}(document),function(a){var b=!1,c=[],d=[],e={},f={},g=window.head_conf&&head_conf.head||"head",h=window[g]=window[g]||{};h.js=function(){var a=arguments,d=[].slice.call(a,1),e=d[0];if(!b)return c.push(function(){h.js.apply(null,a)});e?(k(e)||l.apply(null,d),n(i(a[0]),k(e)?e:function(){h.js.apply(null,d)})):n(i(a[0]));return h.js},h.ready=function(a,b){if(k(a))return d.push(a);var c=e[a];c?c.push[b]:c=e[a]=[b];return h.js};function i(a){var b=f[a.url||a];if(b)return b;if(typeof a=="object")for(var c in a)b={name:c,url:a[c]};else b={name:a.substring(a.indexOf("/",10)+1,a.indexOf("?")),url:a};f[b.url]=b;return b}function j(a,b){if(a){typeof a=="object"&&(a=[].slice.call(a));for(var c=0;c<a.length;c++)b.call(a,a[c],c)}}function k(a){return Object.prototype.toString.call(a)=="[object Function]"}function l(){j(arguments,function(a){k(a)||m(i(a))})}function m(b,c){if(!b.state){b.state="preloading",b.onpreload=[];function d(){b.state="preloaded",j(b.onpreload,function(a){a.call()})}if(/Firefox/.test(navigator.userAgent)){var e=a.createElement("object");e.data=b.url,e.width=0,e.height=0,e.onload=function(){d(),setTimeout(function(){a.body.removeChild(e)},1)},a.body.appendChild(e)}else o({src:b.url,type:"cache"},d)}}function n(a,b){if(a.state=="loaded")return b();if(a.state=="preloading")return a.onpreload.push(function(){n(a,b)});a.state="loading",o(a.url,function(){a.state="loaded",b&&b.call(),j(e[a.name],function(a){a.call()});var c=!0;for(var g in f)f[g].state!="loaded"&&(c=!1);c&&j(d,function(a){a.done||a.call(),a.done=!0})})}function o(b,c){var d=a.getElementsByTagName("head")[0],e=a.createElement("script");e.type="text/"+(b.type||"javascript"),e.src=b.src||b,e.onreadystatechange=e.onload=function(){c.done||(c.call(),c.done=!0),document.all||d.removeChild(e)},d.appendChild(e)}setTimeout(function(){b=!0,j(c,function(a){a.call()})},250)}(document)
+(function(a){var b=a.documentElement,c={screens:[320,480,640,768,1024,1280,1440,1680,1920],section:"-section",page:"-page",head:"head"},d=[];if(typeof window.head_conf=="object")for(var e in head_conf)head_conf[e]&&(c[e]=head_conf[e]);window.head_conf=c;function f(a){d.push(a)}function g(a){var c=new RegExp("\\b"+a+"\\b");b.className=b.className.replace(c,"")}function h(a,b){for(var c=0;c<a.length;c++)b.call(a,a[c],c)}var i=window[c.head]=function(){i.ready.apply(null,arguments)};i.feature=function(a,c,e){a?e||(g("no-"+a),g(a)):(b.className+=" "+d.join(" "),d=[]),f((c?"":"no-")+a),i[a]=c;return i};var j=navigator.userAgent.toLowerCase();j=/(webkit)[ \/]([\w.]+)/.exec(j)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(j)||/(msie) ([\w.]+)/.exec(j)||!/compatible/.test(j)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(j)||[],j[1]=="msie"&&(j[1]="ie"),f(j[1]),i.browser={version:j[2]},i.browser[j[1]]=!0;if(i.browser.ie)for(var k=3;k<11;k++)parseFloat(j[2])<k&&f("lt-ie"+k);h("abbr|article|aside|audio|canvas|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video".split("|"),function(b){a.createElement(b)});var l=location.pathname,m=l.split("/"),n=m.slice(0,m.length-1).join("-")||"root",o=m.slice(-1)[0]||"index",p=o.indexOf(".");p>=0&&(o=o.substring(0,p)),i.section=n,i.pageId=o,f(n+c.section),b.id=o+c.page;function q(){var a=document.width||window.outerWidth||document.documentElement.clientWidth;b.className=b.className.replace(/ (w|lt)-\d+/g,""),f("w-"+Math.round(a/100)*100),h(c.screens,function(b){a<=b&&f("lt-"+b)})}q(),window.onresize=q,i.feature("script",!0).feature()})(document),function(a){var b=document.createElement("i"),c=b.style,d=" -o- -moz- -ms- -webkit- -khtml- ".split(" ");function e(a){c.cssText=d.join(a+";");var b=c.cssText?c.cssText.length:0;return b>0&&!c.cssText.split(";")[1]}var f={gradient:function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(#fff));",e="linear-gradient(left top,#eee,#fff);";c.cssText=(a+d.join(b+a)+d.join(e+a)).slice(0,-a.length);return c.backgroundImage},rgba:function(){c.cssText="background-color:rgba(0,0,0,0.5)";return c.backgroundColor},boxshadow:function(){return e("box-shadow: 0 0 0 red")},textshadow:function(){return c.textShadow===""},multiplebgs:function(){c.cssText="background:url(//:),url(//:),red url(//:)";return(new RegExp("(url\\s*\\(.*?){3}")).test(c.background)},borderimage:function(){return e("border-image: url(m.png) 1 1 stretch")},borderradius:function(){return e("border-radius:0")},opacity:function(){return e("opacity:.1")},reflections:function(){return e("box-reflect:right 0")},transforms:function(){return e("transform:rotate(1deg)")},transitions:function(){return e("transition:all .1s linear")}};for(var g in f)f[g]&&a.feature(g,f[g].call(),!0);a.feature()}(window[head_conf.head]),function(a){var b=a.documentElement,c=!1,d=[],e=[],f={},g={},h=window.head_conf&&head_conf.head||"head",i=window[h]=window[h]||{};i.js=function(){var a=arguments,b=[].slice.call(a,1),e=b[0];if(!c){d.push(function(){i.js.apply(null,a)});return i}e?(l(e)||m.apply(null,b),p(j(a[0]),l(e)?e:function(){i.js.apply(null,b)})):p(j(a[0]));return i},i.ready=function(a,b){if(l(a))return e.push(a);var c=f[a];c?c.push(b):c=f[a]=[b];return i};function j(a){var b=g[a.url||a];if(b)return b;if(typeof a=="object")for(var c in a)a[c]&&(b={name:c,url:a[c]});else b={name:a.substring(a.indexOf("/",10)+1,a.indexOf("?")),url:a};g[b.url]=b;return b}function k(a,b){if(a){typeof a=="object"&&(a=[].slice.call(a));for(var c=0;c<a.length;c++)b.call(a,a[c],c)}}function l(a){return Object.prototype.toString.call(a)=="[object Function]"}function m(){k(arguments,function(a){l(a)||o(j(a))})}function n(a){a.state="preloaded",k(a.onpreload,function(a){a.call()})}function o(c,d){if(!c.state){c.state="preloading",c.onpreload=[];if(/Firefox/.test(navigator.userAgent)){var e=a.createElement("object");e.data=c.url,e.width=0,e.height=0,e.onload=function(){n(c),setTimeout(function(){b.removeChild(e)},1)},b.appendChild(e)}else q({src:c.url,type:"cache"},function(){n(c)})}}function p(a,b){if(a.state=="loaded")return b();if(a.state=="preloading")return a.onpreload.push(function(){p(a,b)});a.state="loading",q(a.url,function(){a.state="loaded",b&&b.call(),k(f[a.name],function(a){a.call()});var c=!0;for(var d in g)g[d].state!="loaded"&&(c=!1);c&&k(e,function(a){a.done||a.call(),a.done=!0})})}function q(c,d){var e=a.createElement("script");e.type="text/"+(c.type||"javascript"),e.src=c.src||c,e.onreadystatechange=e.onload=function(){d.done||(d.call(),d.done=!0),document.all||b.removeChild(e)},b.appendChild(e)}setTimeout(function(){c=!0,k(d,function(a){a.call()})},200)}(document)
diff --git a/src/head.core.js b/src/head.core.js
index 22a2b42..8f0db6f 100644
--- a/src/head.core.js
+++ b/src/head.core.js
@@ -7,17 +7,19 @@
 (function(doc) {
 	
 	var html = doc.documentElement,
-	 	 conf = {
+		conf = {
 			screens: [320, 480, 640, 768, 1024, 1280, 1440, 1680, 1920],
 			section: "-section",
 			page: "-page",
 			head: "head"
-		 },
-		 klass = [];
+		},
+		klass = [];
 		
 	if (typeof window.head_conf == 'object') {
 		for (var key in head_conf) {
-			conf[key] = head_conf[key];
+			if (head_conf[key]) {
+				conf[key] = head_conf[key];
+			}
 		}
 	} 
 	
@@ -33,30 +35,31 @@
 	}
 
 	function each(arr, fn) {	
-		for (var i = 0; i < arr.length; i++)
+		for (var i = 0; i < arr.length; i++) {
 			fn.call(arr, arr[i], i);
+		}
 	}
 	
 	// API	 
 	var api = window[conf.head] = function() {
 		api.ready.apply(null, arguments);
-	};	
+	}; 
 
 	api.feature = function(key, enabled, queue) {
 		
 		/*% internal %*/
 		  if (!key) { 
-			 	html.className += ' ' + klass.join( ' ' );
-			 	klass = [];		  
+				html.className += ' ' + klass.join( ' ' );
+				klass = [];		  
 		  } else if (!queue) { 
-		  		removeClass('no-' + key); removeClass(key); 
+				removeClass('no-' + key); removeClass(key); 
 		  }
 		/*% endinternal %*/
 		
 		pushClass((enabled ? '' : 'no-') + key);
 		api[key] = !!enabled;
 		return api;
-	};	
+	}; 
 	
 	// browser type & version
 	var ua = navigator.userAgent.toLowerCase();
@@ -66,19 +69,19 @@
 		/(msie) ([\w.]+)/.exec( ua ) ||
 		!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || [];
 		
-	if (ua[1] == 'msie') ua[1] = 'ie';
+	if (ua[1] == 'msie') { ua[1] = 'ie'; }
 	pushClass(ua[1]);
 	// pushClass(ua[1] + ua[2].replace(/\./g, "").substring(0, 3));
 	
 	api.browser = { version: ua[2] };
-	api.browser[ua[1]] = true;	
+	api.browser[ua[1]] = true; 
 	
 	// IE specific
 	if (api.browser.ie) {
 		
 		// IE versions
 		for (var ver = 3; ver < 11; ver++) {
-			if (parseFloat(ua[2]) < ver) { pushClass("lt-ie" + ver); } 			
+			if (parseFloat(ua[2]) < ver) { pushClass("lt-ie" + ver); }			
 		}
 	} 
 	
@@ -98,7 +101,7 @@
 	
 	
 	api.section = section;	
-	api.pageId = pageId;	
+	api.pageId = pageId; 
 
 	pushClass(section + conf.section);
 	html.id = pageId + conf.page;
@@ -116,10 +119,10 @@
 		
 		each(conf.screens, function(width) {
 			if (w <= width) { pushClass("lt-" + width); } 
-		})
+		});
 	}
 	
-	screenSize();	 	
+	screenSize();		
 	window.onresize = screenSize;
 	
 	api.feature("script", true).feature();
diff --git a/src/head.detect.js b/src/head.detect.js
index 2d6b42f..a5d99f7 100644
--- a/src/head.detect.js
+++ b/src/head.detect.js
@@ -92,7 +92,9 @@
 	
 	// queue features	
 	for (var key in tests) {		
-		api.feature(key, tests[key].call(), true);
+		if (tests[key]) {
+			api.feature(key, tests[key].call(), true);
+		}
 	}
 	
 	// enable features at once
diff --git a/src/head.loader.js b/src/head.loader.js
index 8e567f3..edea0b9 100644
--- a/src/head.loader.js
+++ b/src/head.loader.js
@@ -35,7 +35,7 @@
 		if (next) {				
 			
 			// preload all immediately
-			if (!isFunc(next)) preloadAll.apply(null, rest);
+			if (!isFunc(next)) { preloadAll.apply(null, rest); }
 		
 			// load all recursively in order
 			load(getScript(args[0]), isFunc(next) ? next : function() {	
@@ -44,7 +44,7 @@
 			
 		// single script	
 		} else {
-			load(getScript(args[0])); 	
+			load(getScript(args[0]));
 		}
 		
 		return api;		 
@@ -57,25 +57,21 @@
 						
 		var arr = waiters[key];
 		if (!arr) { arr = waiters[key] = [fn]; }
-		else arr.push[fn];
-		return api.js;
+		else { arr.push(fn); }
+		return api;
 	};
-
-	/*
-	api.dump = function() {
-		console.info(scripts);
-	};
-	*/
 	
 	/*** private functions ***/
 	function getScript(url) {
 		
 		var script = scripts[url.url || url];
-		if (script) return script;
+		if (script) { return script; }
 		
 		if (typeof url == 'object')  {
 			for (var key in url) {
-				script = { name: key, url: url[key] };	
+				if (url[key]) {
+					script = { name: key, url: url[key] };
+				}
 			}
 		} else {
 			script = { name: url.substring(url.indexOf("/", 10) + 1, url.indexOf("?")), url: url }; 
@@ -86,14 +82,15 @@
 	}
 	
 	function each(arr, fn) {
-		if (!arr) return;
+		if (!arr) { return; }
 		
 		// arguments special type
 		if (typeof arr == 'object') { arr = [].slice.call(arr); }
 		
 		// do the job
-		for (var i = 0; i < arr.length; i++)
+		for (var i = 0; i < arr.length; i++) {
 			fn.call(arr, arr[i], i);
+		}
 	}
 	
 	function isFunc(el) {
@@ -108,23 +105,20 @@
 		});		
 	}
 	
+	function onPreload(script) {
+		script.state = "preloaded";
+
+		each(script.onpreload, function(el) {
+			el.call();
+		});					
+	}
+	
 	function preload(script, callback) {
 		
 		if (!script.state) {
 			
-			//* console.info("PRELOAD", script.name)
-			
 			script.state = "preloading";
 			script.onpreload = [];
-
-			function onload() {
-				script.state = "preloaded";
-				
-				//* console.info("    PRE", script.name);
-				each(script.onpreload, function(el) {
-					el.call();
-				});					
-			}
 			
 			/*
 				Browser detection required. Firefox does not support script.type = text/cache
@@ -137,7 +131,7 @@
 				obj.height = 0;		
 				
 				obj.onload = function() {
-					onload();
+					onPreload(script);
 					
 					// avoid spinning progress indicator with setTimeout
 					setTimeout(function() { head.removeChild(obj); }, 1);
@@ -146,15 +140,15 @@
 				head.appendChild(obj);
 				
 			} else {
-				scriptTag({ src: script.url, type: 'cache'}, onload);	
-			}
-			
+				scriptTag({ src: script.url, type: 'cache'}, function()  {
+					onPreload(script);		
+				});
+			} 
 		}
 	}
 	
 	
-	function load(script, callback) {		
-
+	function load(script, callback) {	
 
 		if (script.state == 'loaded') { return callback(); }
 			
@@ -163,8 +157,6 @@
 				load(script, callback);	
 			});
 		}
-
-		//* console.info("LOAD", script.name, ":", script.state)
 		
 		script.state = 'loading'; 
 
@@ -172,9 +164,7 @@
 			
 			script.state = 'loaded';
 			
-			if (callback) callback.call();			
-			
-			//* console.info("    LOADED", script.name);
+			if (callback) { callback.call(); }			
 			
 			// waiters for this script
 			each(waiters[script.name], function(fn) {
@@ -185,12 +175,12 @@
 			var allLoaded = true;
 		
 			for (var key in scripts) {
-				if (scripts[key].state != 'loaded') allLoaded = false;	
+				if (scripts[key].state != 'loaded') { allLoaded = false; }	
 			}
 		
 			if (allLoaded) {
 				each(thelast, function(fn) {
-					if (!fn.done) fn.call();
+					if (!fn.done) { fn.call(); }
 					fn.done = true;
 				});
 			}
diff --git a/test/loader/headjs.html b/test/loader/headjs.html
index dc2ff90..fd6842b 100644
--- a/test/loader/headjs.html
+++ b/test/loader/headjs.html
@@ -2,7 +2,7 @@
 
 <head>
 	<script>var now = new Date();</script>
-	<script src="../../src/head.loader.js"></script>	
+	<script src="../../head.min.js"></script>	
 	<link rel="stylesheet" type="text/css" href="style.css"/>
 	
 	<script>