diff --git a/dist/moon.js b/dist/moon.js
index 95ce09e0..a7957769 100644
--- a/dist/moon.js
+++ b/dist/moon.js
@@ -43,7 +43,7 @@
     }
   };
 
-  var whitespaceRE = /\s+/;
+  var whitespaceRE = /^\s+$/;
 
   var parseAttributes = function (index, input, length, dependencies, attributes) {
     while (index < length) {
@@ -118,7 +118,6 @@
 
   var parseOpeningTag = function (index, input, length, stack, dependencies) {
     var element = {
-      index: stack[0].nextIndex++,
       type: "",
       attributes: [],
       children: []
@@ -129,6 +128,11 @@
 
       if (char === ">") {
         var attributes = element.attributes;
+
+        if (element.type[0] !== "#") {
+          element.index = stack[0].nextIndex++;
+        }
+
         stack.push(element);
 
         for (var i = 0; i < attributes.length;) {
@@ -136,7 +140,6 @@
 
           if (attribute.key[0] === "#") {
             element = {
-              index: stack[0].nextIndex++,
               type: attribute.key,
               attributes: [{
                 key: "",
@@ -157,6 +160,10 @@
         index += 1;
         break;
       } else if (char === "/" && input[index + 1] === ">") {
+        if (element.type[0] !== "#") {
+          element.index = stack[0].nextIndex++;
+        }
+        
         stack[stack.length - 1].children.push(element);
 
         index += 2;
@@ -240,7 +247,6 @@
 
     if (!whitespaceRE.test(content)) {
       stack[stack.length - 1].children.push({
-        index: stack[0].nextIndex++,
         type: "#text",
         attributes: [{
           key: "",
@@ -270,7 +276,6 @@
     }
 
     stack[stack.length - 1].children.push({
-      index: stack[0].nextIndex++,
       type: "#text",
       attributes: [{
         key: "",
@@ -324,7 +329,7 @@
     var result = "";
 
     for (var i = 0; i < arr.length; i++) {
-      result += fn(arr[i], i);
+      result += fn(arr[i]);
     }
 
     return result;
@@ -354,71 +359,111 @@
 
   var insertBefore = function (element, reference, parent) { return ("m.ib(" + (getElement(element)) + "," + (getElement(reference)) + "," + (getElement(parent)) + ");"); };
 
-  var generateCreate = function (element, index, parent, root, insert) {
-    var createCode, mountCode = "", mountElement = element.index;
+  var generateMount = function (element, parent, insert) { return insert === undefined ? appendChild(element, parent) : insertBefore(element, insert, parent); };
 
+  var generateCreate = function (element, parent, root, insert) {
     switch (element.type) {
-      case "#if":
+      case "#if": {
         var siblings = parent.children;
-        var ifReference = root.nextIndex++;
-        var ifCreates = "";
-        var ifBranches = "";
-
-        for (var i = index; i < siblings.length;) {
-          var sibling = siblings[i];
-          var keyword = (void 0);
-
-          if (sibling.type === "#if") {
-            keyword = "if(" + (attributeValue(sibling.attributes[0])) + ")";
-          } else if (sibling.type === "#elseif") {
-            keyword = "else if(" + (attributeValue(sibling.attributes[0])) + ")";
-          } else if (sibling.type === "#else") {
-            keyword = "else";
-          } else {
-            break;
-          }
+        var nextSiblingIndex = siblings.indexOf(element) + 1;
+        var nextSibling = siblings[nextSiblingIndex];
 
-          ifCreates += setElement(sibling.index, ("function(){" + (mapReduce(sibling.children, function (child, index) { return generateCreate(child, index, parent, root, ifReference); })) + "};"));
-          ifBranches += keyword + "{" + (getElement(sibling.index)) + "();}";
-          siblings.splice(i, 1);
+        element.ifReference = root.nextIndex++;
+        element.ifState = root.nextIndex++;
+        element.ifCreate = generateCreate(element.children[0], parent, root, element.ifReference);
+
+        if (nextSibling !== undefined && nextSibling.type === "#else") {
+          nextSibling.ifState = element.ifState;
+          nextSibling.ifReference = element.ifReference;
+        } else {
+          siblings.splice(nextSiblingIndex, 0, {
+            type: "#else",
+            attributes: [],
+            children: [{
+              type: "#comment",
+              attributes: [],
+              children: []
+            }],
+            ifState: element.ifState,
+            ifReference: element.ifReference
+          });
         }
 
-        createCode = setElement(ifReference, createComment());
-        mountCode = ifCreates + ifBranches;
-        mountElement = ifReference;
-        break;
-      case "#text":
-        createCode = setElement(mountElement, createTextNode(attributeValue(element.attributes[0])));
-        break;
-      default:
-        createCode = setElement(mountElement, createElement(element.type)) + mapReduce(element.attributes, function (attribute) { return attribute.key[0] === "@" ? addEventListener(mountElement, attribute) : setAttribute(mountElement, attribute); }) + mapReduce(element.children, function (child, index) { return generateCreate(child, index, element, root); });
+        return setElement(element.ifReference, createComment()) + generateMount(element.ifReference, parent.index, insert);
+      }
+      case "#else": {
+        element.ifCreate = generateCreate(element.children[0], parent, root, element.ifReference);
+        return "";
+      }
+      case "#comment": {
+        element.commentElement = root.nextIndex++;
+        return setElement(element.commentElement, createComment());
+      }
+      case "#text": {
+        var textAttribute = element.attributes[0];
+        element.textElement = root.nextIndex++;
+        return setElement(element.textElement, createTextNode(textAttribute.dynamic ? "\"\"" : attributeValue(textAttribute))) + generateMount(element.textElement, parent.index, insert);
+      }
+      default: {
+        return setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, function (attribute) {
+          if (attribute.key[0] === "@") {
+            return addEventListener(element.index, attribute);
+          } else if (attribute.dynamic) {
+            return "";
+          } else {
+            return setAttribute(element.index, attribute);
+          }
+        }) + mapReduce(element.children, function (child) { return generateCreate(child, element, root); }) + generateMount(element.index, parent.index, insert);
+      }
     }
+  };
 
-    return createCode + (insert === undefined ? appendChild(mountElement, parent.index) : insertBefore(mountElement, insert, parent.index)) + mountCode;
+  var generateDestroy = function (element, parent, root) {
+    switch (element.type) {
+      case "#if": {
+        return removeChild(element.ifReference, parent.index) + generateDestroy(element.children[0], parent, root);
+      }
+      case "#comment": {
+        return removeChild(element.commentElement, parent.index);
+      }
+      case "#text": {
+        return removeChild(element.textElement, parent.index);
+      }
+      default: {
+        return removeChild(element.index, parent.index);
+      }
+    }
   };
 
-  var generateUpdate = function (element, index, parent, root) {
+  var generateUpdate = function (element, parent, root) {
     switch (element.type) {
-      case "#text":
-        var content = element.attributes[0];
-        return content.dynamic ? setTextContent(element.index, content.value) : "";
-        break;
-      default:
+      case "#text": {
+        var textAttribute = element.attributes[0];
+        return textAttribute.dynamic ? setTextContent(element.index, textAttribute.value) : "";
+      }
+      case "#if": {
+        var ifChild = element.children[0];
+        return ("\n      if (" + (attributeValue(element.attributes[0])) + ") {\n        if (" + (getElement(element.ifState)) + " === 0) {\n          " + (generateUpdate(ifChild, parent, root)) + "\n        } else {\n          " + (generateDestroy(ifChild, parent, root)) + "\n          " + (element.ifCreate) + "\n          " + (setElement(element.ifState, "0")) + "\n        }\n      }\n      ");
+      }
+      case "#else": {
+        var ifChild$1 = element.children[0];
+        return ("\n      else {\n        if (" + (getElement(element.ifState)) + " === 1) {\n          " + (generateUpdate(ifChild$1, parent, root)) + "\n        } else {\n          " + (generateDestroy(ifChild$1, parent, root)) + "\n          " + (element.ifCreate) + "\n          " + (setElement(element.ifState, "1")) + "\n        }\n      }\n      ");
+      }
+      default: {
         return mapReduce(element.attributes, function (attribute) {
           if (attribute.key[0] === "@" || !attribute.dynamic) {
             return "";
           } else {
             return setAttribute(element.index, attribute);
           }
-        }) + mapReduce(element.children, function (child, index) { return generateUpdate(child, index, element, root); });
+        }) + mapReduce(element.children, function (child) { return generateUpdate(child, element, root); });
+      }
     }
   };
 
-  var generateDestroy = function (element, index, parent, root) { return removeChild(element.index, parent.index); };
-
   var generate = function (tree) {
     var prelude = mapReduce(tree.dependencies, function (dependency) { return ("var " + dependency + "=this.data." + dependency + ";"); });
-    return new Function(("return [function(m){this.m[0]=m;m=this.m;" + prelude + (mapReduce(tree.children, function (child, index) { return generateCreate(child, index, tree, tree); })) + "},function(){var m=this.m;" + prelude + (mapReduce(tree.children, function (child, index) { return generateUpdate(child, index, tree, tree); })) + "},function(){var m=this.m;" + (mapReduce(tree.children, function (child, index) { return generateDestroy(child, index, tree, tree); })) + "m=[m[0]];}];"))();
+    return new Function(("return [function(m){this.m[0]=m;m=this.m;" + prelude + (mapReduce(tree.children, function (child) { return generateCreate(child, tree, tree); })) + "},function(){var m=this.m;" + prelude + (mapReduce(tree.children, function (child) { return generateUpdate(child, tree, tree); })) + "},function(){var m=this.m;" + (mapReduce(tree.children, function (child) { return generateDestroy(child, tree, tree); })) + "m=[m[0]];}];"))();
   };
 
   var compile = function (input) {
@@ -474,7 +519,7 @@
 
   var create = function(root) {
     this.view[0](root);
-    this.emit("created");
+    this.emit("create");
   };
 
   var update = function(key, value) {
@@ -497,14 +542,14 @@
       setTimeout(function () {
         instance.view[1]();
         instance.queued = false;
-        instance.emit("updated");
+        instance.emit("update");
       }, 0);
     }
   };
 
   var destroy = function() {
     this.view[2]();
-    this.emit("destroyed");
+    this.emit("destroy");
   };
 
   var on = function(type, handler) {
@@ -603,6 +648,7 @@
     var instance = new instanceComponent();
 
     instance.create(root);
+    instance.update();
 
     return instance;
   }
diff --git a/dist/moon.min.js b/dist/moon.min.js
index 9bd4e8f5..0be1ae0b 100644
--- a/dist/moon.min.js
+++ b/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * https://kbrsh.github.io/moon
  */
-!function(e,t){"undefined"==typeof module?e.Moon=t():module.exports=t()}(this,function(){"use strict";var u=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,a=["NaN","event","false","in","m","null","this","true","typeof","undefined"],s=function(e,t){for(var n,i=!1;null!==(n=u.exec(e));){var r=n[1];void 0!==r&&-1===a.indexOf(r)&&"$"!==r[0]&&(i=!0,-1===t.indexOf(r)&&t.push(r))}return i},e={silent:!0},d=/\s+/,v=function(e,t,n,i,r){for(;e<n;){var u=t[e];if("/"===u||">"===u)break;if(d.test(u))e+=1;else{for(var a="",o="",c=!1;e<n;){if("/"===(u=t[e])||">"===u||d.test(u)){o=a;break}if("="===u){e+=1;break}a+=u,e+=1}if(0===o.length){var f=void 0;for('"'===(u=t[e])||"'"===u?(f=u,e+=1):"{"===u?(f="}",c=!0,e+=1):f=d;e<n&&"/"!==(u=t[e])&&">"!==u;){if("object"==typeof f&&f.test(u)||u===f){e+=1;break}o+=u,e+=1}}r.push({key:a,value:o,expression:c,dynamic:c&&s(o,i)})}}return e},o=function(e,t,n,i,r){for(var u={index:i[0].nextIndex++,type:"",attributes:[],children:[]};e<n;){var a=t[e];if(">"===a){var o=u.attributes;i.push(u);for(var c=0;c<o.length;){var f=o[c];"#"===f.key[0]?(u={index:i[0].nextIndex++,type:f.key,attributes:[{key:"",value:f.value,expression:f.expression,dynamic:f.dynamic}],children:[u]},o.splice(c,1)):c+=1}i[i.length-2].children.push(u),e+=1;break}if("/"===a&&">"===t[e+1]){i[i.length-1].children.push(u),e+=2;break}d.test(a)&&(e+=1)||"="===a?e=v(e,t,n,r,u.attributes):(u.type+=a,e+=1)}return e},c=function(e,t,n,i){for(;e<n;e++){var r=t[e];if(">"===r){e+=1;break}r}var u=i.pop();return u.type,e},f=function(e,t,n){for(;e<n;){var i=t[e],r=t[e+1],u=t[e+2];if("<"===i&&"!"===r&&"-"===u&&"-"===t[e+3])e=f(e+4,t,n);else{if("-"===i&&"-"===r&&">"===u){e+=3;break}e+=1}}return e},h=/(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g,l={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n"},p=function(e,t,n,i){for(var r="";e<n;e++){var u=t[e];if("<"===u||"{"===u)break;r+=u}return d.test(r)||i[i.length-1].children.push({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:r.replace(h,function(e){return l[e]}),expression:!1,dynamic:!1}],children:[]}),e},m=function(e,t,n,i,r){for(var u="";e<n;e++){var a=t[e];if("}"===a){e+=1;break}u+=a}return i[i.length-1].children.push({index:i[0].nextIndex++,type:"#text",attributes:[{key:"",value:u,expression:!0,dynamic:s(u,r)}],children:[]}),e},k=function(e,t){for(var n="",i=0;i<e.length;i++)n+=t(e[i],i);return n},g=function(e){return"m["+e+"]"},w=function(e,t){return g(e)+"="+t},q=function(e){return e.expression?e.value:'"'+e.value+'"'},I=function(e,t){return"m.sa("+g(e)+',"'+t.key+'",'+q(t)+");"},$=function(n,e,i,r,t){var u,a,o,c,f,s,d="",v=n.index;switch(n.type){case"#if":for(var h=i.children,l=r.nextIndex++,p="",m="",x=e;x<h.length;){var y=h[x],b=void 0;if("#if"===y.type)b="if("+q(y.attributes[0])+")";else if("#elseif"===y.type)b="else if("+q(y.attributes[0])+")";else{if("#else"!==y.type)break;b="else"}p+=w(y.index,"function(){"+k(y.children,function(e,t){return $(e,t,i,r,l)})+"};"),m+=b+"{"+g(y.index)+"();}",h.splice(x,1)}u=w(l,"m.cc();"),d=p+m,v=l;break;case"#text":u=w(v,"m.ctn("+q(n.attributes[0])+");");break;default:u=w(v,'m.ce("'+n.type+'");')+k(n.attributes,function(e){return"@"===e.key[0]?(t=e,"m.ael("+g(v)+',"'+t.key.substring(1)+'",function($event){'+q(t)+"});"):I(v,e);var t})+k(n.children,function(e,t){return $(e,t,n,r)})}return u+(void 0===t?(f=v,s=i.index,"m.ac("+g(f)+","+g(s)+");"):(a=v,o=t,c=i.index,"m.ib("+g(a)+","+g(o)+","+g(c)+");"))+d},x=function(n,e,t,i){switch(n.type){case"#text":var r=n.attributes[0];return r.dynamic?(u=n.index,a=r.value,"m.stc("+g(u)+","+a+");"):"";default:return k(n.attributes,function(e){return"@"!==e.key[0]&&e.dynamic?I(n.index,e):""})+k(n.children,function(e,t){return x(e,t,n,i)})}var u,a},i=function(e,t,n,i){return r=e.index,u=n.index,"m.rc("+g(r)+","+g(u)+");";var r,u},y=function(e){return n=function(e){for(var t=e.length,n=[],i={index:0,nextIndex:1,type:"#root",attributes:[],children:[],dependencies:n},r=[i],u=0;u<t;){var a=e[u];u="<"===a?"!"===e[u+1]&&"-"===e[u+2]&&"-"===e[u+3]?f(u+4,e,t):"/"===e[u+1]?c(u+2,e,t,r):o(u+1,e,t,r,n):"{"===a?m(u+1,e,t,r,n):p(u,e,t,r)}return i}(e),t=k(n.dependencies,function(e){return"var "+e+"=this.data."+e+";"}),new Function("return [function(m){this.m[0]=m;m=this.m;"+t+k(n.children,function(e,t){return $(e,t,n,n)})+"},function(){var m=this.m;"+t+k(n.children,function(e,t){return x(e,t,n,n)})+"},function(){var m=this.m;"+k(n.children,function(e,t){return i(e,0,n)})+"m=[m[0]];}];")();var n,t},b={},A=function(e){return document.createElement(e)},z=function(e){return document.createTextNode(e)},C=function(){return document.createComment("")},Z=function(e,t,n){e.setAttribute(t,n)},_=function(e,t,n){e.addEventListener(t,n)},j=function(e,t){e.textContent=t},N=function(e,t){t.appendChild(e)},O=function(e,t){t.removeChild(e)},E=function(e,t,n){n.insertBefore(e,t)},T=function(e){this.view[0](e),this.emit("created")},B=function(e,t){if(void 0!==e)if("object"==typeof e)for(var n in e)this.data[n]=e[n];else this.data[e]=t;if(!1===this.queued){this.queued=!0;var i=this;setTimeout(function(){i.view[1](),i.queued=!1,i.emit("updated")},0)}},F=function(){this.view[2](),this.emit("destroyed")},L=function(e,t){var n=this.data,i=n[e];void 0===i?n[e]=t:"function"==typeof i?n[e]=[i,t]:i.push(t)},M=function(e,t){if(void 0===t)this.data[e]=[];else{var n=this.data,i=n[e];"function"==typeof i?n[e]=void 0:i.splice(i.indexOf(t),1)}},S=function(e,t){var n=this.data[e];if(void 0!==n)if("function"==typeof n)n(t);else for(var i=0;i<n.length;i++)n[i](t)},D=function(u,a){return function(){var e,t=this;this.name=u,this.queued=!1,this.view=a.view.map(function(e){return e.bind(t)}),this.m=((e=[]).c=b,e.ce=A,e.ctn=z,e.cc=C,e.sa=Z,e.ael=_,e.stc=j,e.ac=N,e.rc=O,e.ib=E,e);var n=this.data=a.data(),i=a.actions;for(var r in i)n[r]=i[r].bind(t);this.create=T,this.update=B,this.destroy=F,this.on=L,this.off=M,this.emit=S}};function t(e){var t=e.root;"string"==typeof t&&(t=document.querySelector(t));var n=e.view;"string"==typeof n&&(e.view=y(n));var i=e.data;void 0===i?e.data=function(){return{}}:"object"==typeof i&&(e.data=function(){return i}),void 0===e.actions&&(e.actions={});var r=new(D("#m",e));return r.create(t),r}return t.extend=function(e,t){var n=t.view;"string"==typeof n&&(t.view=y(n)),void 0===t.data&&(t.data=function(){return{}}),void 0===t.actions&&(t.actions={}),b[e]=D(e,t)},t.compile=y,t.config=e,t});
\ No newline at end of file
+!function(e,t){"undefined"==typeof module?e.Moon=t():module.exports=t()}(this,function(){"use strict";var a=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,u=["NaN","event","false","in","m","null","this","true","typeof","undefined"],s=function(e,t){for(var n,i=!1;null!==(n=a.exec(e));){var r=n[1];void 0!==r&&-1===u.indexOf(r)&&"$"!==r[0]&&(i=!0,-1===t.indexOf(r)&&t.push(r))}return i},e={silent:!0},d=/^\s+$/,l=function(e,t,n,i,r){for(;e<n;){var a=t[e];if("/"===a||">"===a)break;if(d.test(a))e+=1;else{for(var u="",c="",f=!1;e<n;){if("/"===(a=t[e])||">"===a||d.test(a)){c=u;break}if("="===a){e+=1;break}u+=a,e+=1}if(0===c.length){var o=void 0;for('"'===(a=t[e])||"'"===a?(o=a,e+=1):"{"===a?(o="}",f=!0,e+=1):o=d;e<n&&"/"!==(a=t[e])&&">"!==a;){if("object"==typeof o&&o.test(a)||a===o){e+=1;break}c+=a,e+=1}}r.push({key:u,value:c,expression:f,dynamic:f&&s(c,i)})}}return e},c=function(e,t,n,i,r){for(var a={type:"",attributes:[],children:[]};e<n;){var u=t[e];if(">"===u){var c=a.attributes;"#"!==a.type[0]&&(a.index=i[0].nextIndex++),i.push(a);for(var f=0;f<c.length;){var o=c[f];"#"===o.key[0]?(a={type:o.key,attributes:[{key:"",value:o.value,expression:o.expression,dynamic:o.dynamic}],children:[a]},c.splice(f,1)):f+=1}i[i.length-2].children.push(a),e+=1;break}if("/"===u&&">"===t[e+1]){"#"!==a.type[0]&&(a.index=i[0].nextIndex++),i[i.length-1].children.push(a),e+=2;break}d.test(u)&&(e+=1)||"="===u?e=l(e,t,n,r,a.attributes):(a.type+=u,e+=1)}return e},f=function(e,t,n,i){for(;e<n;e++){var r=t[e];if(">"===r){e+=1;break}r}var a=i.pop();return a.type,e},o=function(e,t,n){for(;e<n;){var i=t[e],r=t[e+1],a=t[e+2];if("<"===i&&"!"===r&&"-"===a&&"-"===t[e+3])e=o(e+4,t,n);else{if("-"===i&&"-"===r&&">"===a){e+=3;break}e+=1}}return e},v=/(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g,h={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n"},m=function(e,t,n,i){for(var r="";e<n;e++){var a=t[e];if("<"===a||"{"===a)break;r+=a}return d.test(r)||i[i.length-1].children.push({type:"#text",attributes:[{key:"",value:r.replace(v,function(e){return h[e]}),expression:!1,dynamic:!1}],children:[]}),e},p=function(e,t,n,i,r){for(var a="";e<n;e++){var u=t[e];if("}"===u){e+=1;break}a+=u}return i[i.length-1].children.push({type:"#text",attributes:[{key:"",value:a,expression:!0,dynamic:s(a,r)}],children:[]}),e},x=function(e,t){for(var n="",i=0;i<e.length;i++)n+=t(e[i]);return n},y=function(e){return"m["+e+"]"},b=function(e,t){return y(e)+"="+t},k=function(e){return e.expression?e.value:'"'+e.value+'"'},g=function(e,t){return"m.sa("+y(e)+',"'+t.key+'",'+k(t)+");"},i=function(e,t){return"m.rc("+y(e)+","+y(t)+");"},w=function(e,t,n){return void 0===n?(a=t,"m.ac("+y(e)+","+y(a)+");"):(i=n,r=t,"m.ib("+y(e)+","+y(i)+","+y(r)+");");var i,r,a},R=function(i,e,t,n){switch(i.type){case"#if":var r=e.children,a=r.indexOf(i)+1,u=r[a];return i.ifReference=t.nextIndex++,i.ifState=t.nextIndex++,i.ifCreate=R(i.children[0],e,t,i.ifReference),void 0!==u&&"#else"===u.type?(u.ifState=i.ifState,u.ifReference=i.ifReference):r.splice(a,0,{type:"#else",attributes:[],children:[{type:"#comment",attributes:[],children:[]}],ifState:i.ifState,ifReference:i.ifReference}),b(i.ifReference,"m.cc();")+w(i.ifReference,e.index,n);case"#else":return i.ifCreate=R(i.children[0],e,t,i.ifReference),"";case"#comment":return i.commentElement=t.nextIndex++,b(i.commentElement,"m.cc();");case"#text":var c=i.attributes[0];return i.textElement=t.nextIndex++,b(i.textElement,"m.ctn("+(c.dynamic?'""':k(c))+");")+w(i.textElement,e.index,n);default:return b(i.index,'m.ce("'+i.type+'");')+x(i.attributes,function(e){return"@"===e.key[0]?(t=i.index,n=e,"m.ael("+y(t)+',"'+n.key.substring(1)+'",function($event){'+k(n)+"});"):e.dynamic?"":g(i.index,e);var t,n})+x(i.children,function(e){return R(e,i,t)})+w(i.index,e.index,n)}},S=function(e,t,n){switch(e.type){case"#if":return i(e.ifReference,t.index)+S(e.children[0],t,n);case"#comment":return i(e.commentElement,t.index);case"#text":return i(e.textElement,t.index);default:return i(e.index,t.index)}},E=function(t,e,n){switch(t.type){case"#text":var i=t.attributes[0];return i.dynamic?(u=t.index,c=i.value,"m.stc("+y(u)+","+c+");"):"";case"#if":var r=t.children[0];return"\n      if ("+k(t.attributes[0])+") {\n        if ("+y(t.ifState)+" === 0) {\n          "+E(r,e,n)+"\n        } else {\n          "+S(r,e,n)+"\n          "+t.ifCreate+"\n          "+b(t.ifState,"0")+"\n        }\n      }\n      ";case"#else":var a=t.children[0];return"\n      else {\n        if ("+y(t.ifState)+" === 1) {\n          "+E(a,e,n)+"\n        } else {\n          "+S(a,e,n)+"\n          "+t.ifCreate+"\n          "+b(t.ifState,"1")+"\n        }\n      }\n      ";default:return x(t.attributes,function(e){return"@"!==e.key[0]&&e.dynamic?g(t.index,e):""})+x(t.children,function(e){return E(e,t,n)})}var u,c},C=function(e){return t=function(e){for(var t=e.length,n=[],i={index:0,nextIndex:1,type:"#root",attributes:[],children:[],dependencies:n},r=[i],a=0;a<t;){var u=e[a];a="<"===u?"!"===e[a+1]&&"-"===e[a+2]&&"-"===e[a+3]?o(a+4,e,t):"/"===e[a+1]?f(a+2,e,t,r):c(a+1,e,t,r,n):"{"===u?p(a+1,e,t,r,n):m(a,e,t,r)}return i}(e),n=x(t.dependencies,function(e){return"var "+e+"=this.data."+e+";"}),new Function("return [function(m){this.m[0]=m;m=this.m;"+n+x(t.children,function(e){return R(e,t,t)})+"},function(){var m=this.m;"+n+x(t.children,function(e){return E(e,t,t)})+"},function(){var m=this.m;"+x(t.children,function(e){return S(e,t,t)})+"m=[m[0]];}];")();var t,n},q={},I=function(e){return document.createElement(e)},$=function(e){return document.createTextNode(e)},A=function(){return document.createComment("")},z=function(e,t,n){e.setAttribute(t,n)},O=function(e,t,n){e.addEventListener(t,n)},Z=function(e,t){e.textContent=t},_=function(e,t){t.appendChild(e)},j=function(e,t){t.removeChild(e)},N=function(e,t,n){n.insertBefore(e,t)},T=function(e){this.view[0](e),this.emit("create")},B=function(e,t){if(void 0!==e)if("object"==typeof e)for(var n in e)this.data[n]=e[n];else this.data[e]=t;if(!1===this.queued){this.queued=!0;var i=this;setTimeout(function(){i.view[1](),i.queued=!1,i.emit("update")},0)}},F=function(){this.view[2](),this.emit("destroy")},L=function(e,t){var n=this.data,i=n[e];void 0===i?n[e]=t:"function"==typeof i?n[e]=[i,t]:i.push(t)},M=function(e,t){if(void 0===t)this.data[e]=[];else{var n=this.data,i=n[e];"function"==typeof i?n[e]=void 0:i.splice(i.indexOf(t),1)}},D=function(e,t){var n=this.data[e];if(void 0!==n)if("function"==typeof n)n(t);else for(var i=0;i<n.length;i++)n[i](t)},G=function(a,u){return function(){var e,t=this;this.name=a,this.queued=!1,this.view=u.view.map(function(e){return e.bind(t)}),this.m=((e=[]).c=q,e.ce=I,e.ctn=$,e.cc=A,e.sa=z,e.ael=O,e.stc=Z,e.ac=_,e.rc=j,e.ib=N,e);var n=this.data=u.data(),i=u.actions;for(var r in i)n[r]=i[r].bind(t);this.create=T,this.update=B,this.destroy=F,this.on=L,this.off=M,this.emit=D}};function t(e){var t=e.root;"string"==typeof t&&(t=document.querySelector(t));var n=e.view;"string"==typeof n&&(e.view=C(n));var i=e.data;void 0===i?e.data=function(){return{}}:"object"==typeof i&&(e.data=function(){return i}),void 0===e.actions&&(e.actions={});var r=new(G("#m",e));return r.create(t),r.update(),r}return t.extend=function(e,t){var n=t.view;"string"==typeof n&&(t.view=C(n)),void 0===t.data&&(t.data=function(){return{}}),void 0===t.actions&&(t.actions={}),q[e]=G(e,t)},t.compile=C,t.config=e,t});
\ No newline at end of file
diff --git a/src/compiler/generator/create.js b/src/compiler/generator/create.js
index 0595acb9..6cb706e6 100644
--- a/src/compiler/generator/create.js
+++ b/src/compiler/generator/create.js
@@ -1,44 +1,60 @@
-import { mapReduce, getElement, setElement, createElement, createTextNode, createComment, attributeValue, setAttribute, addEventListener, appendChild, insertBefore } from "./util";
+import { mapReduce, setElement, createElement, createTextNode, createComment, attributeValue, setAttribute, addEventListener, appendChild, insertBefore } from "./util";
 
-export const generateCreate = (element, index, parent, root, insert) => {
-  let createCode, mountCode = "", mountElement = element.index;
+const generateMount = (element, parent, insert) => insert === undefined ? appendChild(element, parent) : insertBefore(element, insert, parent);
 
+export const generateCreate = (element, parent, root, insert) => {
   switch (element.type) {
-    case "#if":
+    case "#if": {
       const siblings = parent.children;
-      const ifReference = root.nextIndex++;
-      let ifCreates = "";
-      let ifBranches = "";
+      const nextSiblingIndex = siblings.indexOf(element) + 1;
+      const nextSibling = siblings[nextSiblingIndex];
 
-      for (let i = index; i < siblings.length;) {
-        const sibling = siblings[i];
-        let keyword;
+      element.ifReference = root.nextIndex++;
+      element.ifState = root.nextIndex++;
+      element.ifCreate = generateCreate(element.children[0], parent, root, element.ifReference);
 
-        if (sibling.type === "#if") {
-          keyword = `if(${attributeValue(sibling.attributes[0])})`;
-        } else if (sibling.type === "#elseif") {
-          keyword = `else if(${attributeValue(sibling.attributes[0])})`;
-        } else if (sibling.type === "#else") {
-          keyword = "else";
-        } else {
-          break;
-        }
-
-        ifCreates += setElement(sibling.index, `function(){${mapReduce(sibling.children, (child, index) => generateCreate(child, index, parent, root, ifReference))}};`);
-        ifBranches += `${keyword}{${getElement(sibling.index)}();}`;
-        siblings.splice(i, 1);
+      if (nextSibling !== undefined && nextSibling.type === "#else") {
+        nextSibling.ifState = element.ifState;
+        nextSibling.ifReference = element.ifReference;
+      } else {
+        siblings.splice(nextSiblingIndex, 0, {
+          type: "#else",
+          attributes: [],
+          children: [{
+            type: "#comment",
+            attributes: [],
+            children: []
+          }],
+          ifState: element.ifState,
+          ifReference: element.ifReference
+        });
       }
 
-      createCode = setElement(ifReference, createComment());
-      mountCode = ifCreates + ifBranches;
-      mountElement = ifReference;
-      break;
-    case "#text":
-      createCode = setElement(mountElement, createTextNode(attributeValue(element.attributes[0])));
-      break;
-    default:
-      createCode = setElement(mountElement, createElement(element.type)) + mapReduce(element.attributes, (attribute) => attribute.key[0] === "@" ? addEventListener(mountElement, attribute) : setAttribute(mountElement, attribute)) + mapReduce(element.children, (child, index) => generateCreate(child, index, element, root));
+      return setElement(element.ifReference, createComment()) + generateMount(element.ifReference, parent.index, insert);
+    }
+    case "#else": {
+      element.ifCreate = generateCreate(element.children[0], parent, root, element.ifReference);
+      return "";
+    }
+    case "#comment": {
+      element.commentElement = root.nextIndex++;
+      return setElement(element.commentElement, createComment());
+    }
+    case "#text": {
+      const textAttribute = element.attributes[0];
+      element.textElement = root.nextIndex++;
+      return setElement(element.textElement, createTextNode(textAttribute.dynamic ? "\"\"" : attributeValue(textAttribute))) + generateMount(element.textElement, parent.index, insert);
+    }
+    default: {
+      return setElement(element.index, createElement(element.type)) + mapReduce(element.attributes, (attribute) => {
+        if (attribute.key[0] === "@") {
+          return addEventListener(element.index, attribute);
+        } else if (attribute.dynamic) {
+          return "";
+        } else {
+          return setAttribute(element.index, attribute);
+        }
+      }) + mapReduce(element.children, (child) => generateCreate(child, element, root)) + generateMount(element.index, parent.index, insert);
+    }
   }
-
-  return createCode + (insert === undefined ? appendChild(mountElement, parent.index) : insertBefore(mountElement, insert, parent.index)) + mountCode;
 };
diff --git a/src/compiler/generator/destroy.js b/src/compiler/generator/destroy.js
index 42350150..cc28efcb 100644
--- a/src/compiler/generator/destroy.js
+++ b/src/compiler/generator/destroy.js
@@ -1,3 +1,18 @@
 import { removeChild } from "./util";
 
-export const generateDestroy = (element, index, parent, root) => removeChild(element.index, parent.index);
+export const generateDestroy = (element, parent, root) => {
+  switch (element.type) {
+    case "#if": {
+      return removeChild(element.ifReference, parent.index) + generateDestroy(element.children[0], parent, root);
+    }
+    case "#comment": {
+      return removeChild(element.commentElement, parent.index);
+    }
+    case "#text": {
+      return removeChild(element.textElement, parent.index);
+    }
+    default: {
+      return removeChild(element.index, parent.index);
+    }
+  }
+};
diff --git a/src/compiler/generator/generator.js b/src/compiler/generator/generator.js
index faaa1d2f..507d22b1 100644
--- a/src/compiler/generator/generator.js
+++ b/src/compiler/generator/generator.js
@@ -5,5 +5,5 @@ import { mapReduce } from "./util";
 
 export const generate = (tree) => {
   const prelude = mapReduce(tree.dependencies, (dependency) => `var ${dependency}=this.data.${dependency};`);
-  return new Function(`return [function(m){this.m[0]=m;m=this.m;${prelude}${mapReduce(tree.children, (child, index) => generateCreate(child, index, tree, tree))}},function(){var m=this.m;${prelude}${mapReduce(tree.children, (child, index) => generateUpdate(child, index, tree, tree))}},function(){var m=this.m;${mapReduce(tree.children, (child, index) => generateDestroy(child, index, tree, tree))}m=[m[0]];}];`)();
+  return new Function(`return [function(m){this.m[0]=m;m=this.m;${prelude}${mapReduce(tree.children, (child) => generateCreate(child, tree, tree))}},function(){var m=this.m;${prelude}${mapReduce(tree.children, (child) => generateUpdate(child, tree, tree))}},function(){var m=this.m;${mapReduce(tree.children, (child) => generateDestroy(child, tree, tree))}m=[m[0]];}];`)();
 };
diff --git a/src/compiler/generator/update.js b/src/compiler/generator/update.js
index 5b69b57e..10f04472 100644
--- a/src/compiler/generator/update.js
+++ b/src/compiler/generator/update.js
@@ -1,18 +1,48 @@
-import { mapReduce, setAttribute, setTextContent } from "./util";
+import { generateDestroy } from "./destroy";
+import { mapReduce, getElement, setElement, attributeValue, setAttribute, setTextContent } from "./util";
 
-export const generateUpdate = (element, index, parent, root) => {
+export const generateUpdate = (element, parent, root) => {
   switch (element.type) {
-    case "#text":
-      const content = element.attributes[0];
-      return content.dynamic ? setTextContent(element.index, content.value) : "";
-      break;
-    default:
+    case "#text": {
+      const textAttribute = element.attributes[0];
+      return textAttribute.dynamic ? setTextContent(element.index, textAttribute.value) : "";
+    }
+    case "#if": {
+      const ifChild = element.children[0];
+      return `
+      if (${attributeValue(element.attributes[0])}) {
+        if (${getElement(element.ifState)} === 0) {
+          ${generateUpdate(ifChild, parent, root)}
+        } else {
+          ${generateDestroy(ifChild, parent, root)}
+          ${element.ifCreate}
+          ${setElement(element.ifState, "0")}
+        }
+      }
+      `;
+    }
+    case "#else": {
+      const ifChild = element.children[0];
+      return `
+      else {
+        if (${getElement(element.ifState)} === 1) {
+          ${generateUpdate(ifChild, parent, root)}
+        } else {
+          ${generateDestroy(ifChild, parent, root)}
+          ${element.ifCreate}
+          ${setElement(element.ifState, "1")}
+        }
+      }
+      `;
+    }
+    default: {
       return mapReduce(element.attributes, (attribute) => {
         if (attribute.key[0] === "@" || !attribute.dynamic) {
           return "";
         } else {
           return setAttribute(element.index, attribute);
         }
-      }) + mapReduce(element.children, (child, index) => generateUpdate(child, index, element, root));
+      }) + mapReduce(element.children, (child) => generateUpdate(child, element, root));
+    }
   }
 };
diff --git a/src/compiler/generator/util.js b/src/compiler/generator/util.js
index 9da5d454..b31fd867 100644
--- a/src/compiler/generator/util.js
+++ b/src/compiler/generator/util.js
@@ -2,7 +2,7 @@ export const mapReduce = (arr, fn) => {
   let result = "";
 
   for (let i = 0; i < arr.length; i++) {
-    result += fn(arr[i], i);
+    result += fn(arr[i]);
   }
 
   return result;
diff --git a/src/compiler/parser/expression.js b/src/compiler/parser/expression.js
index dcdd1fe3..71965e01 100644
--- a/src/compiler/parser/expression.js
+++ b/src/compiler/parser/expression.js
@@ -15,7 +15,6 @@ export const parseExpression = (index, input, length, stack, dependencies) => {
   }
 
   stack[stack.length - 1].children.push({
-    index: stack[0].nextIndex++,
     type: "#text",
     attributes: [{
       key: "",
diff --git a/src/compiler/parser/tag.js b/src/compiler/parser/tag.js
index fca05879..cc87e6a5 100644
--- a/src/compiler/parser/tag.js
+++ b/src/compiler/parser/tag.js
@@ -74,7 +74,6 @@ const parseAttributes = (index, input, length, dependencies, attributes) => {
 
 export const parseOpeningTag = (index, input, length, stack, dependencies) => {
   let element = {
-    index: stack[0].nextIndex++,
     type: "",
     attributes: [],
     children: []
@@ -85,6 +84,11 @@ export const parseOpeningTag = (index, input, length, stack, dependencies) => {
 
     if (char === ">") {
       const attributes = element.attributes;
+
+      if (element.type[0] !== "#") {
+        element.index = stack[0].nextIndex++;
+      }
+
       stack.push(element);
 
       for (let i = 0; i < attributes.length;) {
@@ -92,7 +96,6 @@ export const parseOpeningTag = (index, input, length, stack, dependencies) => {
 
         if (attribute.key[0] === "#") {
           element = {
-            index: stack[0].nextIndex++,
             type: attribute.key,
             attributes: [{
               key: "",
@@ -113,6 +116,10 @@ export const parseOpeningTag = (index, input, length, stack, dependencies) => {
       index += 1;
       break;
     } else if (char === "/" && input[index + 1] === ">") {
+      if (element.type[0] !== "#") {
+        element.index = stack[0].nextIndex++;
+      }
+      
       stack[stack.length - 1].children.push(element);
 
       index += 2;
diff --git a/src/compiler/parser/text.js b/src/compiler/parser/text.js
index b319e355..d5296226 100644
--- a/src/compiler/parser/text.js
+++ b/src/compiler/parser/text.js
@@ -27,7 +27,6 @@ export const parseText = (index, input, length, stack) => {
 
   if (!whitespaceRE.test(content)) {
     stack[stack.length - 1].children.push({
-      index: stack[0].nextIndex++,
       type: "#text",
       attributes: [{
         key: "",
diff --git a/src/compiler/parser/util.js b/src/compiler/parser/util.js
index 3e416a20..d0d761d3 100644
--- a/src/compiler/parser/util.js
+++ b/src/compiler/parser/util.js
@@ -1,3 +1,3 @@
 export { error } from "../../util/util";
 
-export const whitespaceRE = /\s+/;
+export const whitespaceRE = /^\s+$/;
diff --git a/src/component/component.js b/src/component/component.js
index 39f15246..62efb41d 100644
--- a/src/component/component.js
+++ b/src/component/component.js
@@ -2,7 +2,7 @@ import { m } from "../util/m";
 
 const create = function(root) {
   this.view[0](root);
-  this.emit("created");
+  this.emit("create");
 };
 
 const update = function(key, value) {
@@ -23,14 +23,14 @@ const update = function(key, value) {
     setTimeout(() => {
       instance.view[1]();
       instance.queued = false;
-      instance.emit("updated");
+      instance.emit("update");
     }, 0);
   }
 };
 
 const destroy = function() {
   this.view[2]();
-  this.emit("destroyed");
+  this.emit("destroy");
 };
 
 const on = function(type, handler) {
diff --git a/src/index.js b/src/index.js
index 1608f494..7dd826c9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -32,6 +32,7 @@ export default function Moon(options) {
   const instance = new instanceComponent();
 
   instance.create(root);
+  instance.update();
 
   return instance;
 }