diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 
diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js
index 60772fd..164fd48 100644
--- a/src/filters/displacement/DisplacementFilter.js
+++ b/src/filters/displacement/DisplacementFilter.js
@@ -72,7 +72,7 @@
     this.maskMatrix = maskMatrix;
 
 
-    this.scale = new PIXI.Point(20,20);
+    this.scale = new core.math.Point(20,20);
 
 }
 

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 
diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js
index 60772fd..164fd48 100644
--- a/src/filters/displacement/DisplacementFilter.js
+++ b/src/filters/displacement/DisplacementFilter.js
@@ -72,7 +72,7 @@
     this.maskMatrix = maskMatrix;
 
 
-    this.scale = new PIXI.Point(20,20);
+    this.scale = new core.math.Point(20,20);
 
 }
 
diff --git a/src/loaders/loader.js b/src/loaders/loader.js
index bcab9c8..49ae91c 100644
--- a/src/loaders/loader.js
+++ b/src/loaders/loader.js
@@ -2,7 +2,7 @@
     textureParser = require('./textureParser'),
     spritesheetParser = require('./spritesheetParser'),
     spineAtlasParser = require('./spineAtlasParser'),
-    bitmapFontParser = require('./bitmapFontParser')
+    bitmapFontParser = require('./bitmapFontParser');
  //   loader = new Loader();
 
 var Loader = function()
@@ -26,7 +26,7 @@
 
     // parse any spritesheet data into multiple textures
     .use(bitmapFontParser());
-}
+};
 
 Loader.prototype = Object.create(ResourceLoader.prototype);
 Loader.prototype.constructor = Loader;

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 
diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js
index 60772fd..164fd48 100644
--- a/src/filters/displacement/DisplacementFilter.js
+++ b/src/filters/displacement/DisplacementFilter.js
@@ -72,7 +72,7 @@
     this.maskMatrix = maskMatrix;
 
 
-    this.scale = new PIXI.Point(20,20);
+    this.scale = new core.math.Point(20,20);
 
 }
 
diff --git a/src/loaders/loader.js b/src/loaders/loader.js
index bcab9c8..49ae91c 100644
--- a/src/loaders/loader.js
+++ b/src/loaders/loader.js
@@ -2,7 +2,7 @@
     textureParser = require('./textureParser'),
     spritesheetParser = require('./spritesheetParser'),
     spineAtlasParser = require('./spineAtlasParser'),
-    bitmapFontParser = require('./bitmapFontParser')
+    bitmapFontParser = require('./bitmapFontParser');
  //   loader = new Loader();
 
 var Loader = function()
@@ -26,7 +26,7 @@
 
     // parse any spritesheet data into multiple textures
     .use(bitmapFontParser());
-}
+};
 
 Loader.prototype = Object.create(ResourceLoader.prototype);
 Loader.prototype.constructor = Loader;
diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js
index 5a519d5..0a5b541 100644
--- a/src/loaders/spritesheetParser.js
+++ b/src/loaders/spritesheetParser.js
@@ -16,7 +16,7 @@
 
             var route = path.dirname(resource.url.replace(this.baseUrl, ''));
 
-            var resolution = core.utils.getResolutionOfUrl( resource.url )
+            var resolution = core.utils.getResolutionOfUrl( resource.url );
 
             // load the image for this sheet
             this.add(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions, function (res)

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 
diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js
index 60772fd..164fd48 100644
--- a/src/filters/displacement/DisplacementFilter.js
+++ b/src/filters/displacement/DisplacementFilter.js
@@ -72,7 +72,7 @@
     this.maskMatrix = maskMatrix;
 
 
-    this.scale = new PIXI.Point(20,20);
+    this.scale = new core.math.Point(20,20);
 
 }
 
diff --git a/src/loaders/loader.js b/src/loaders/loader.js
index bcab9c8..49ae91c 100644
--- a/src/loaders/loader.js
+++ b/src/loaders/loader.js
@@ -2,7 +2,7 @@
     textureParser = require('./textureParser'),
     spritesheetParser = require('./spritesheetParser'),
     spineAtlasParser = require('./spineAtlasParser'),
-    bitmapFontParser = require('./bitmapFontParser')
+    bitmapFontParser = require('./bitmapFontParser');
  //   loader = new Loader();
 
 var Loader = function()
@@ -26,7 +26,7 @@
 
     // parse any spritesheet data into multiple textures
     .use(bitmapFontParser());
-}
+};
 
 Loader.prototype = Object.create(ResourceLoader.prototype);
 Loader.prototype.constructor = Loader;
diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js
index 5a519d5..0a5b541 100644
--- a/src/loaders/spritesheetParser.js
+++ b/src/loaders/spritesheetParser.js
@@ -16,7 +16,7 @@
 
             var route = path.dirname(resource.url.replace(this.baseUrl, ''));
 
-            var resolution = core.utils.getResolutionOfUrl( resource.url )
+            var resolution = core.utils.getResolutionOfUrl( resource.url );
 
             // load the image for this sheet
             this.add(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions, function (res)
diff --git a/src/loaders/textureParser.js b/src/loaders/textureParser.js
index 0b054df..6ed2884 100644
--- a/src/loaders/textureParser.js
+++ b/src/loaders/textureParser.js
@@ -7,8 +7,6 @@
         // create a new texture if the data is an Image object
         if (resource.data && resource.data.nodeName && resource.data.nodeName.toLowerCase() === 'img')
         {
-            console.log(resource);
-
             resource.texture = new core.Texture(new core.BaseTexture(resource.data, null, core.utils.getResolutionOfUrl(resource.url)));
             // lets also add the frame to pixi's global cache for fromFrame and fromImage fucntions
             core.utils.TextureCache[resource.url] = resource.texture;

diff --git a/src/core/index.js b/src/core/index.js
index c7e1706..83721d5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -92,17 +92,23 @@
 
 
 var contextOptions = { stencil: true };
-function checkWebGL() {
-    try {
-        if (!window.WebGLRenderingContext) {
+
+function checkWebGL()
+{
+    try
+    {
+        if (!window.WebGLRenderingContext)
+        {
             return false;
         }
 
         var canvas = document.createElement('canvas'),
-            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions)
+            gl = canvas.getContext('webgl', contextOptions) || canvas.getContext('experimental-webgl', contextOptions);
 
         return !!(gl && gl.getContextAttributes().stencil);
-    } catch (e) {
+    }
+    catch (e)
+    {
         return false;
     }
 }
diff --git a/src/core/renderers/canvas/utils/CanvasBuffer.js b/src/core/renderers/canvas/utils/CanvasBuffer.js
index 0ebd152..ed9c248 100644
--- a/src/core/renderers/canvas/utils/CanvasBuffer.js
+++ b/src/core/renderers/canvas/utils/CanvasBuffer.js
@@ -87,7 +87,7 @@
     this.canvas.height = height;
 };
 
-CanvasBuffer.prototype.destroy = function (width, height)
+CanvasBuffer.prototype.destroy = function ()
 {
     this.context = null;
     this.canvas = null;
diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js
index 058cd42..db2baee 100644
--- a/src/core/renderers/webgl/shaders/Shader.js
+++ b/src/core/renderers/webgl/shaders/Shader.js
@@ -424,7 +424,10 @@
 
     var texture = uniform.value.baseTexture;
 
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded)
+    {
+        return;
+    }
 
     texture._glTextures[gl.id] = gl.createTexture();
 
diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js
index 49c5d61..1619596 100644
--- a/src/core/sprites/webgl/SpriteRenderer.js
+++ b/src/core/sprites/webgl/SpriteRenderer.js
@@ -244,14 +244,12 @@
 
     var index = this.currentBatchSize * this.vertByteSize;
 
-    var resolution = texture.baseTexture.resolution;
-
     var worldTransform = sprite.worldTransform;
 
-    var a = worldTransform.a// / resolution;
-    var b = worldTransform.b// / resolution;
-    var c = worldTransform.c// / resolution;
-    var d = worldTransform.d// / resolution;
+    var a = worldTransform.a;
+    var b = worldTransform.b;
+    var c = worldTransform.c;
+    var d = worldTransform.d;
     var tx = worldTransform.tx;
     var ty = worldTransform.ty;
 
diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js
index 60772fd..164fd48 100644
--- a/src/filters/displacement/DisplacementFilter.js
+++ b/src/filters/displacement/DisplacementFilter.js
@@ -72,7 +72,7 @@
     this.maskMatrix = maskMatrix;
 
 
-    this.scale = new PIXI.Point(20,20);
+    this.scale = new core.math.Point(20,20);
 
 }
 
diff --git a/src/loaders/loader.js b/src/loaders/loader.js
index bcab9c8..49ae91c 100644
--- a/src/loaders/loader.js
+++ b/src/loaders/loader.js
@@ -2,7 +2,7 @@
     textureParser = require('./textureParser'),
     spritesheetParser = require('./spritesheetParser'),
     spineAtlasParser = require('./spineAtlasParser'),
-    bitmapFontParser = require('./bitmapFontParser')
+    bitmapFontParser = require('./bitmapFontParser');
  //   loader = new Loader();
 
 var Loader = function()
@@ -26,7 +26,7 @@
 
     // parse any spritesheet data into multiple textures
     .use(bitmapFontParser());
-}
+};
 
 Loader.prototype = Object.create(ResourceLoader.prototype);
 Loader.prototype.constructor = Loader;
diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js
index 5a519d5..0a5b541 100644
--- a/src/loaders/spritesheetParser.js
+++ b/src/loaders/spritesheetParser.js
@@ -16,7 +16,7 @@
 
             var route = path.dirname(resource.url.replace(this.baseUrl, ''));
 
-            var resolution = core.utils.getResolutionOfUrl( resource.url )
+            var resolution = core.utils.getResolutionOfUrl( resource.url );
 
             // load the image for this sheet
             this.add(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions, function (res)
diff --git a/src/loaders/textureParser.js b/src/loaders/textureParser.js
index 0b054df..6ed2884 100644
--- a/src/loaders/textureParser.js
+++ b/src/loaders/textureParser.js
@@ -7,8 +7,6 @@
         // create a new texture if the data is an Image object
         if (resource.data && resource.data.nodeName && resource.data.nodeName.toLowerCase() === 'img')
         {
-            console.log(resource);
-
             resource.texture = new core.Texture(new core.BaseTexture(resource.data, null, core.utils.getResolutionOfUrl(resource.url)));
             // lets also add the frame to pixi's global cache for fromFrame and fromImage fucntions
             core.utils.TextureCache[resource.url] = resource.texture;
diff --git a/src/text/BitmapText.js b/src/text/BitmapText.js
index a8e69ec..bd5e1eb 100644
--- a/src/text/BitmapText.js
+++ b/src/text/BitmapText.js
@@ -301,7 +301,7 @@
     }
 
     // remove unnecessary children.
-    for (var i = lenChars; i < this._glyphs.length; ++i)
+    for (i = lenChars; i < this._glyphs.length; ++i)
     {
         this.removeChild(this._glyphs[i]);
     }