diff --git a/dist/dwelibs.min.js b/dist/dwelibs.min.js
index f27986d..6e87a0a 100644
--- a/dist/dwelibs.min.js
+++ b/dist/dwelibs.min.js
@@ -1 +1 @@
-!function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(i,r,function(e){return t[e]}.bind(null,r));return i},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";window.DWE={};n(1),n(2),n(3),n(4),n(5),n(6),n(7)},function(t,e,n){"use strict";DWE.context=function(t){return t.star=function(e,n,i,r,o){var a=Math.PI/2*3,s=e,u=n,l=Math.PI/i;t.beginPath(),t.moveTo(e,n-r);for(var h=0;h<i;h++)s=e+Math.cos(a)*r,u=n+Math.sin(a)*r,t.lineTo(s,u),a+=l,s=e+Math.cos(a)*o,u=n+Math.sin(a)*o,t.lineTo(s,u),a+=l;t.lineTo(e,n-r),t.closePath()},t.fillStar=function(e,n,i,r,o){t.star(e,n,i,r,o),t.fill()},t.circle=function(e,n,i,r){r||(r=0),t.beginPath(),t.arc(e,n,i,r,2*Math.PI,!0),t.closePath()},t.fillCircle=function(e,n,i,r){t.circle(e,n,i,r),t.fill()},t}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}DWE.Math={},DWE.Math.random=function(t,e){return Math.floor(Math.random()*e)+t},DWE.Math.lerp=function(t,e,n){return(1-n)*t+n*e},DWE.Math.reverseLerp=function(t,e,n){return 1/((e-t)*n)},DWE.Math.intersectsBox=function(t,e,n,i,r,o,a,s){return 2*Math.abs(t-r)<=n+a&&2*Math.abs(e-o)<=i+s},DWE.Math.intersects2Box=function(t,e){return 2*Math.abs(t.x-e.x)<=t.width+e.width&&2*Math.abs(t.y-e.y)<=t.height+e.height},DWE.Math.clamp=function(t,e,n){return Math.max(e,Math.min(n,t))},DWE.Math.Vector2=function(){function t(e,n){r(this,t),this.x=e,this.y=n}return i(t,[{key:"normalize",value:function(){var t=this.magnitude;this.x/=t,this.y/=t}},{key:"distance",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Distance function takes another Vector2 as an argument.");return Math.abs(Math.sqrt(Math.pow(t.x-this.x,2)+Math.pow(t.y-this.y,2)))}},{key:"magnitude",get:function(){return Math.abs(Math.sqrt(this.x*this.x+this.y*this.y))}}]),t}(),DWE.Math.Box2=function(){function t(e,n,i,o){r(this,t),this.x=e,this.y=n,this.width=i,this.height=o}return i(t,[{key:"intersectsBox",value:function(t){if(!(t instanceof DWE.Math.Box2))throw new Error("Intersection function takes another Box2 as an argument.");return DWE.Math.intersects2Box(this,t)}},{key:"intersectsCircle",value:function(t){if(!(t instanceof DWE.Math.Circle))throw new Error("Intersection function takes another Circle as an argument.");var e=new DWE.Math.Vector2(Math.abs(t.x-this.x),Math.abs(t.y-this.y));return!(e.x>this.width/2+t.r)&&(!(e.y>this.height/2+t.r)&&(e.x<=this.width/2||(e.y<=this.height/2||Math.pow(e.x-this.width/2,2)+Math.pow(e.y-this.height/2,2)<=Math.pow(t.r,2))))}}]),t}(),DWE.Math.Circle=function(){function t(e,n,i){r(this,t),this.x=e,this.y=n,this.r=i}return i(t,[{key:"radius",get:function(){return this.r}}]),t}()},function(t,e,n){"use strict";DWE.getMousePosition=function(t,e){var n=void 0,i=void 0;if(t.changedTouches){var r=t.changedTouches[0];r&&(t.pageX=r.pageX,t.pageY=r.pageY)}return t.pageX||t.pageY?(n=t.pageX,i=t.pageY):(n=t.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,i=t.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=e.offsetLeft,i-=e.offsetTop,new DWE.Math.Vector2(n,i)}},function(t,e,n){"use strict";DWE.Keyboard={};var i={},r={},o={backspace:8,tab:9,enter:13,shift:16,ctrl:17,alt:18,pausebreak:19,capslock:20,escape:27,pgup:33,pgdown:34,end:35,home:36,left:37,up:38,right:39,down:40,insert:45,delete:46,"left-window":91,"right-window":92,select:93,numpad0:96,numpad1:97,numpad2:98,numpad3:99,numpad4:100,numpad5:101,numpad6:102,numpad7:103,numpad8:104,numpad9:105,multiply:106,add:107,subtract:109,decimal:110,divide:111,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123,numlock:144,scrolllock:145,"semi-colon":186,equals:187,comma:188,dash:189,period:190,fwdslash:191,grave:192,"open-bracket":219,bkslash:220,"close-braket":221,"single-quote":222};function a(t){return null!=i[t]&&i[t]}function s(t){return null!=r[t]&&r[t]}DWE.Keyboard.toggleKey=function(t,e){var n=null;for(var r in o){if(t===o[r]){n=r;break}}n||(n=String.fromCharCode(t).toLowerCase()),i[n]=!0===e},DWE.Keyboard.keyDown=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!0)},DWE.Keyboard.keyUp=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!1)},DWE.Keyboard.isDown=function(t){return a(t)&&s(t)},DWE.Keyboard.isUp=function(t){return!DWE.Keyboard.isDown(t)},DWE.Keyboard.isPressed=function(t){return!0===a(t)&&!1===s(t)},DWE.Keyboard.nextIteration=function(){for(var t in r={},i)!0===i[t]&&(r[t]=!0)}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Image={},DWE.Image.Image=function(t){var e=this;this.src=t,this.img=new Image,this.img.src=this.src,this.width=0,this.height=0,this.loaded=!1,this.errored=!1,this.img.onload=function(){e.loaded=!0,e.width=e.img.width,e.height=e.img.height,e.onload&&e.onload.apply(e,[])},this.img.onerror=function(t){e.loaded=!1,e.errored=!0,e.onerror&&e.onerror.apply(e,[t])}},DWE.Image.TileMap=function(t){function e(t,n,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e);var r=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.aspectWidth=n,r.aspectHeight=i,r.tiles=[],r}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,DWE.Image.Image),i(e,[{key:"onload",value:function(){for(var t=0;t<this.height/this.aspectHeight;t++)for(var e=0;e<this.width/this.aspectWidth;e++)this.tiles.push(new DWE.Math.Vector2(e,t));this.onready&&this.onready.call(this,this)}},{key:"draw",value:function(t,e,n,i,r,o){var a=this.tiles[e];a&&t.drawImage(this.img,a.x*this.aspectWidth,a.y*this.aspectHeight,this.aspectWidth,this.aspectHeight,n,i,r,o)}}]),e}(),DWE.Image.loadImageArray=function(t){return new Promise(function(e,n){var i=0,r=t.length,o=[];!function a(s){var u=t[s],l=new DWE.Image.Image(u);l.onload=function(){o.push(l),++i==r?e(o):a(i)},l.onerror=function(t){n(t)}}(i)})}},function(t,e,n){"use strict";DWE.File={},DWE.File.httpGET=function(t,e){return new Promise(function(n,i){var r=new XMLHttpRequest;r.onreadystatechange=function(){4==r.readyState&&200==r.status?n(!0===e?r.response:r.responseText):4==r.readyState&&r.status>=400&&i(r.responseText)},r.open("GET",t,!0),r.responseType=e?"xml":"text",r.send(null)})},DWE.File.loadXML=function(t){return DWE.File.httpGET(t,!0)},DWE.File.loadJson=function(t){return new Promise(function(e,n){DWE.File.httpGET(t).then(function(t){var i;try{i=JSON.parse(t)}catch(t){return n(t)}e(i)},n)})}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Tiled={},DWE.Tiled.Map=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.file=e;var n=e.split("/");this.name=n[n.length-1],this.dir=n.slice(0,-1).join("/"),this.loaded=!1,this.tileMaps=[],this.layers={},this.tileWidth=0,this.tileHeight=0,this.scale=1,this.loadTiledMap()}return i(t,[{key:"done",value:function(){this.onready&&this.onready.apply(this,[this]),this.loaded=!0}},{key:"error",value:function(t){this.onerror?this.onerror.apply(this,[t]):console.error(t),this.loaded=!1}},{key:"loadTiledMap",value:function(){var t=this;DWE.File.loadJson(this.file).then(function(e){if("orthogonal"!==e.orientation||"right-down"!==e.renderorder)return t.error(new Error("Currently, DWE Libs only allows orthogonal orientation and right-down render order."));var n=t;!function t(i){if(i===e.tilesets.length)return function(){var t=e.width,i=e.height;for(var r in e.layers){var o=e.layers[r],a=[];if("tilelayer"==o.type&&o.visible){for(var s=0;s<t;s++)for(var u=0;u<i;u++){var l=o.data[u*t+s];0!=l&&a.push({x:s,y:u,tile:l})}n.layers[o.name]={tiles:a,x:parseInt(o.x),y:parseInt(o.y)}}}n.width=t,n.height=i,n.tileWidth=e.tilewidth,n.tileHeight=e.tileheight,n.done()}();var r=e.tilesets[i],o=n.dir+"/"+r.source;DWE.File.loadXML(o).then(function(e){var o=(new DOMParser).parseFromString(e,"application/xml").getElementsByTagName("tileset");for(var a in o){var s=o[a];if(s instanceof Element){var u=parseInt(s.getAttribute("tilewidth")),l=parseInt(s.getAttribute("tileheight")),h=s.getElementsByTagName("image")[0];if(h){var c=new DWE.Image.TileMap(n.dir+"/"+h.getAttribute("source"),u,l);c.onready=function(){t(i+1)},c.offset=r.firstgid,c.tileCount=parseInt(s.getAttribute("tilecount")),n.tileMaps.push(c)}}}},function(t){n.error.apply(n,[t])})}(0)},function(t){map.error.apply(map,[t])})}},{key:"drawLayer",value:function(t,e,n,i){if(!this.layers[i])return null;var r=this.layers[i];for(var o in this.tileMaps){var a=this.tileMaps[o];for(var s in r.tiles){var u=r.tiles[s],l=a.tileCount||a.tiles.length;u.tile>=a.offset&&u.tile<=l&&a.draw(t,u.tile-1,u.x*this.tileWidth*this.scale+e.x+r.x+n.x,u.y*this.tileHeight*this.scale+e.y+r.y+n.y,this.tileWidth*this.scale,this.tileHeight*this.scale)}}}},{key:"collideLayer",value:function(t,e){if(!this.layers[e])return null;this.layers[e];return null}},{key:"setScale",value:function(t){this.scale=t}}]),t}()}]);
\ No newline at end of file
+!function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(i,r,function(e){return t[e]}.bind(null,r));return i},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";window.DWE={};n(1),n(2),n(3),n(4),n(5),n(6),n(7)},function(t,e,n){"use strict";DWE.context=function(t){return t.star=function(e,n,i,r,o){var a=Math.PI/2*3,s=e,u=n,h=Math.PI/i;t.beginPath(),t.moveTo(e,n-r);for(var l=0;l<i;l++)s=e+Math.cos(a)*r,u=n+Math.sin(a)*r,t.lineTo(s,u),a+=h,s=e+Math.cos(a)*o,u=n+Math.sin(a)*o,t.lineTo(s,u),a+=h;t.lineTo(e,n-r),t.closePath()},t.fillStar=function(e,n,i,r,o){t.star(e,n,i,r,o),t.fill()},t.circle=function(e,n,i,r){r||(r=0),t.beginPath(),t.arc(e,n,i,r,2*Math.PI,!0),t.closePath()},t.fillCircle=function(e,n,i,r){t.circle(e,n,i,r),t.fill()},t}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}DWE.Math={},DWE.Math.random=function(t,e){return Math.floor(Math.random()*e)+t},DWE.Math.lerp=function(t,e,n){return(1-n)*t+n*e},DWE.Math.reverseLerp=function(t,e,n){return 1/((e-t)*n)},DWE.Math.intersectsBox=function(t,e,n,i,r,o,a,s){return 2*Math.abs(t-r)<=n+a&&2*Math.abs(e-o)<=i+s},DWE.Math.intersects2Box=function(t,e){return 2*Math.abs(t.x-e.x)<=t.width+e.width&&2*Math.abs(t.y-e.y)<=t.height+e.height},DWE.Math.clamp=function(t,e,n){return Math.max(e,Math.min(n,t))},DWE.Math.Vector2=function(){function t(e,n){r(this,t),this.x=e,this.y=n}return i(t,[{key:"normalize",value:function(){var t=this.magnitude;this.x/=t,this.y/=t}},{key:"distance",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Distance function takes another Vector2 as an argument.");return Math.abs(Math.sqrt(Math.pow(t.x-this.x,2)+Math.pow(t.y-this.y,2)))}},{key:"magnitude",get:function(){return Math.abs(Math.sqrt(this.x*this.x+this.y*this.y))}}]),t}(),DWE.Math.Box2=function(){function t(e,n,i,o){r(this,t),this.x=e,this.y=n,this.width=i,this.height=o}return i(t,[{key:"intersectsBox",value:function(t){if(!(t instanceof DWE.Math.Box2))throw new Error("Intersection function takes another Box2 as an argument.");return DWE.Math.intersects2Box(this,t)}},{key:"intersectsCircle",value:function(t){if(!(t instanceof DWE.Math.Circle))throw new Error("Intersection function takes another Circle as an argument.");var e=new DWE.Math.Vector2(Math.abs(t.x-this.x),Math.abs(t.y-this.y));return!(e.x>this.width/2+t.r)&&(!(e.y>this.height/2+t.r)&&(e.x<=this.width/2||(e.y<=this.height/2||Math.pow(e.x-this.width/2,2)+Math.pow(e.y-this.height/2,2)<=Math.pow(t.r,2))))}}]),t}(),DWE.Math.Circle=function(){function t(e,n,i){r(this,t),this.x=e,this.y=n,this.r=i}return i(t,[{key:"radius",get:function(){return this.r}}]),t}()},function(t,e,n){"use strict";DWE.getMousePosition=function(t,e){var n=void 0,i=void 0;if(t.changedTouches){var r=t.changedTouches[0];r&&(t.pageX=r.pageX,t.pageY=r.pageY)}return t.pageX||t.pageY?(n=t.pageX,i=t.pageY):(n=t.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,i=t.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=e.offsetLeft,i-=e.offsetTop,new DWE.Math.Vector2(n,i)}},function(t,e,n){"use strict";DWE.Keyboard={};var i={},r={},o={backspace:8,tab:9,enter:13,shift:16,ctrl:17,alt:18,pausebreak:19,capslock:20,escape:27,pgup:33,pgdown:34,end:35,home:36,left:37,up:38,right:39,down:40,insert:45,delete:46,"left-window":91,"right-window":92,select:93,numpad0:96,numpad1:97,numpad2:98,numpad3:99,numpad4:100,numpad5:101,numpad6:102,numpad7:103,numpad8:104,numpad9:105,multiply:106,add:107,subtract:109,decimal:110,divide:111,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123,numlock:144,scrolllock:145,"semi-colon":186,equals:187,comma:188,dash:189,period:190,fwdslash:191,grave:192,"open-bracket":219,bkslash:220,"close-braket":221,"single-quote":222};function a(t){return null!=i[t]&&i[t]}function s(t){return null!=r[t]&&r[t]}DWE.Keyboard.toggleKey=function(t,e){var n=null;for(var r in o){if(t===o[r]){n=r;break}}n||(n=String.fromCharCode(t).toLowerCase()),i[n]=!0===e},DWE.Keyboard.keyDown=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!0)},DWE.Keyboard.keyUp=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!1)},DWE.Keyboard.isDown=function(t){return a(t)&&s(t)},DWE.Keyboard.isUp=function(t){return!DWE.Keyboard.isDown(t)},DWE.Keyboard.isPressed=function(t){return!0===a(t)&&!1===s(t)},DWE.Keyboard.nextIteration=function(){for(var t in r={},i)!0===i[t]&&(r[t]=!0)}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Image={},DWE.Image.Image=function(t){var e=this;this.src=t,this.img=new Image,this.img.src=this.src,this.width=0,this.height=0,this.loaded=!1,this.errored=!1,this.img.onload=function(){e.loaded=!0,e.width=e.img.width,e.height=e.img.height,e.onload&&e.onload.apply(e,[])},this.img.onerror=function(t){e.loaded=!1,e.errored=!0,e.onerror&&e.onerror.apply(e,[t])}},DWE.Image.TileMap=function(t){function e(t,n,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e);var r=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.aspectWidth=n,r.aspectHeight=i,r.tiles=[],r}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,DWE.Image.Image),i(e,[{key:"onload",value:function(){for(var t=0;t<this.height/this.aspectHeight;t++)for(var e=0;e<this.width/this.aspectWidth;e++)this.tiles.push(new DWE.Math.Vector2(e,t));this.onready&&this.onready.call(this,this)}},{key:"draw",value:function(t,e,n,i,r,o){var a=this.tiles[e];a&&t.drawImage(this.img,a.x*this.aspectWidth,a.y*this.aspectHeight,this.aspectWidth,this.aspectHeight,n,i,r,o)}}]),e}(),DWE.Image.loadImageArray=function(t){return new Promise(function(e,n){var i=0,r=t.length,o=[];!function a(s){var u=t[s],h=new DWE.Image.Image(u);h.onload=function(){o.push(h),++i==r?e(o):a(i)},h.onerror=function(t){n(t)}}(i)})}},function(t,e,n){"use strict";DWE.File={},DWE.File.httpGET=function(t){return new Promise(function(e,n){var i=new XMLHttpRequest;i.onreadystatechange=function(){4==i.readyState&&200==i.status?e(i.responseText):4==i.readyState&&i.status>=400&&n(i.responseText)},i.open("GET",t,!0),i.responseType="text",i.send(null)})},DWE.File.loadJson=function(t){return new Promise(function(e,n){DWE.File.httpGET(t).then(function(t){var i;try{i=JSON.parse(t)}catch(t){return n(t)}e(i)},n)})}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Tiled={},DWE.Tiled.Map=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.file=e;var n=e.split("/");this.name=n[n.length-1],this.dir=n.slice(0,-1).join("/"),this.loaded=!1,this.tileMaps=[],this.layers={},this.tileWidth=0,this.tileHeight=0,this.scale=1,this.loadTiledMap()}return i(t,[{key:"done",value:function(){this.onready&&this.onready.apply(this,[this]),this.loaded=!0}},{key:"error",value:function(t){this.onerror?this.onerror.apply(this,[t]):console.error(t),this.loaded=!1}},{key:"loadTiledMap",value:function(){var t=this;DWE.File.loadJson(this.file).then(function(e){if("orthogonal"!==e.orientation||"right-down"!==e.renderorder)return t.error(new Error("Currently, DWE Libs only allows orthogonal orientation and right-down render order."));var n=t;!function t(i){if(i===e.tilesets.length)return function(){var t=e.width,i=e.height;for(var r in e.layers){var o=e.layers[r],a=o.width||t,s=o.height||i,u=[];if("tilelayer"==o.type&&o.visible){for(var h=0;h<a;h++)for(var l=0;l<s;l++){var c=o.data[l*t+h];0!=c&&u.push({x:h,y:l,tile:c})}n.layers[o.name]={tiles:u,x:parseInt(o.x),y:parseInt(o.y)}}}n.width=t,n.height=i,n.tileWidth=e.tilewidth,n.tileHeight=e.tileheight,n.done()}();var r=e.tilesets[i],o=n.dir+"/"+r.source;DWE.File.httpGET(o).then(function(e){var o=(new DOMParser).parseFromString(e,"application/xml").getElementsByTagName("tileset");for(var a in o){var s=o[a];if(s instanceof Element){var u=parseInt(s.getAttribute("tilewidth")),h=parseInt(s.getAttribute("tileheight")),l=s.getElementsByTagName("image")[0];if(l){var c=new DWE.Image.TileMap(n.dir+"/"+l.getAttribute("source"),u,h);c.offset=r.firstgid,c.tileCount=parseInt(s.getAttribute("tilecount")),n.tileMaps.push(c),c.onready=function(){t(i+1)}}}}},function(t){n.error.apply(n,[t])})}(0)},function(t){map.error.apply(map,[t])})}},{key:"drawLayer",value:function(t,e,n,i){if(!this.layers[i])return null;var r=this.layers[i];for(var o in this.tileMaps){var a=this.tileMaps[o];for(var s in r.tiles){var u=r.tiles[s],h=a.tileCount||a.tiles.length;u.tile>=a.offset&&u.tile<=h&&a.draw(t,u.tile-1,u.x*this.tileWidth*this.scale+e.x+r.x+n.x,u.y*this.tileHeight*this.scale+e.y+r.y+n.y,this.tileWidth*this.scale,this.tileHeight*this.scale)}}}},{key:"collideLayer",value:function(t,e){if(!this.layers[e])return null;this.layers[e];return null}},{key:"setScale",value:function(t){this.scale=t}}]),t}()}]);
\ No newline at end of file
diff --git a/src/file.js b/src/file.js
index 6b60832..8736123 100644
--- a/src/file.js
+++ b/src/file.js
@@ -1,28 +1,24 @@
 
 DWE.File = {}
 
-DWE.File.httpGET = function (url, xml) {
+DWE.File.httpGET = function (url) {
   return new Promise(function (resolve, reject) {
     var xmlHttp = new XMLHttpRequest()
 
     xmlHttp.onreadystatechange = function() {
       if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-        resolve(xml === true ? xmlHttp.response : xmlHttp.responseText)
+        resolve(xmlHttp.responseText)
       } else if (xmlHttp.readyState == 4 && xmlHttp.status >= 400) {
         reject(xmlHttp.responseText)
       }
     }
 
     xmlHttp.open('GET', url, true)
-    xmlHttp.responseType = xml ? 'xml' : 'text'
+    xmlHttp.responseType = 'text'
     xmlHttp.send(null)
   })
 }
 
-DWE.File.loadXML = function (url) {
-  return DWE.File.httpGET(url, true)
-}
-
 DWE.File.loadJson = function (url) {
   return new Promise(function (resolve, reject) {
     var promise = DWE.File.httpGET(url)
diff --git a/src/tiled.js b/src/tiled.js
index cb2edbd..1956539 100644
--- a/src/tiled.js
+++ b/src/tiled.js
@@ -19,9 +19,9 @@ DWE.Tiled.Map = class {
   }
 
   done () {
-    if (this['onready']) {
+    if (this['onready'])
       this.onready.apply(this, [this])
-    }
+
     this.loaded = true
   }
 
@@ -44,15 +44,19 @@ DWE.Tiled.Map = class {
 
       // Load map layers
       function loadMapLayers () {
-        let width = mapData.width
-        let height = mapData.height
+        var width = mapData.width
+        var height = mapData.height
+
         for (let i in mapData.layers) {
           let layer = mapData.layers[i]
+          let lw = layer.width || width
+          let lh = layer.height || height
           let tiles = []
+
           if (layer.type != 'tilelayer' || !layer.visible) continue
 
-          for(let i = 0; i < width; i++) {
-            for(let j = 0; j < height; j++) {
+          for(let i = 0; i < lw; i++) {
+            for(let j = 0; j < lh; j++) {
               let value = layer.data[(j * width) + i]
               if (value == 0) continue
 
@@ -84,25 +88,29 @@ DWE.Tiled.Map = class {
         var xtile = mapData.tilesets[index]
         var path = map.dir + '/' + xtile.source
 
-        DWE.File.loadXML(path).then(function (data) {
+        DWE.File.httpGET(path).then(function (data) {
           var parser = new DOMParser()
           var doc = parser.parseFromString(data, 'application/xml')
           var tilesets = doc.getElementsByTagName('tileset')
-          var dataf = {}
+
           for (let i in tilesets) {
             let d = tilesets[i]
             if (!(d instanceof Element)) continue
+
             let tw = parseInt(d.getAttribute('tilewidth'))
             let th = parseInt(d.getAttribute('tileheight'))
             let imgfile = d.getElementsByTagName('image')[0]
+
             if (imgfile) {
               let img = new DWE.Image.TileMap(map.dir + '/' + imgfile.getAttribute('source'), tw, th)
-              img.onready = function () {
-                loadNextTileMap(index + 1)
-              }
+
               img.offset = xtile.firstgid
               img.tileCount = parseInt(d.getAttribute('tilecount'))
               map.tileMaps.push(img)
+
+              img.onready = function () {
+                loadNextTileMap(index + 1)
+              }
             }
           }
         }, function (e) {
@@ -118,14 +126,17 @@ DWE.Tiled.Map = class {
 
   drawLayer (ctx, origin, viewport, name) {
     if (!this.layers[name]) return null
-    let layer = this.layers[name]
+    var layer = this.layers[name]
+
     for (let i in this.tileMaps) {
-      let t = this.tileMaps[i]
+      let tileMap = this.tileMaps[i]
+
       for (let j in layer.tiles) {
         let tile = layer.tiles[j]
-        let tcount = t.tileCount || t.tiles.length
-        if (tile.tile >= t.offset && tile.tile <= tcount) {
-          t.draw(ctx, tile.tile - 1, ((tile.x * this.tileWidth * this.scale) + origin.x + layer.x) + viewport.x, 
+        let tcount = tileMap.tileCount || tileMap.tiles.length
+
+        if (tile.tile >= tileMap.offset && tile.tile <= tcount) {
+          tileMap.draw(ctx, tile.tile - 1, ((tile.x * this.tileWidth * this.scale) + origin.x + layer.x) + viewport.x, 
             ((tile.y * this.tileHeight * this.scale) + origin.y + layer.y) + viewport.y, this.tileWidth * this.scale,
             this.tileHeight * this.scale)
         }
@@ -135,7 +146,7 @@ DWE.Tiled.Map = class {
 
   collideLayer (object, name) {
     if (!this.layers[name]) return null
-    let layer = this.layers[name]
+    var layer = this.layers[name]
     // TODO: Handle object collisions with map tiles
     return null
   }