diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 29d14a7..7cae0e1 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -100,7 +100,7 @@
         localY = filterArea.y;
 
     if (filterArea.x < 0) {
-        filterArea.x = width += filterArea.x;
+        filterArea.width += filterArea.x;
         filterArea.x = 0;
     }
 

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 29d14a7..7cae0e1 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -100,7 +100,7 @@
         localY = filterArea.y;
 
     if (filterArea.x < 0) {
-        filterArea.x = width += filterArea.x;
+        filterArea.width += filterArea.x;
         filterArea.x = 0;
     }
 
diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js
index 3a78624..eb40d8d 100644
--- a/src/core/textures/BaseTexture.js
+++ b/src/core/textures/BaseTexture.js
@@ -254,7 +254,6 @@
             }
         }
     }
-    }
 };
 
 /**

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 29d14a7..7cae0e1 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -100,7 +100,7 @@
         localY = filterArea.y;
 
     if (filterArea.x < 0) {
-        filterArea.x = width += filterArea.x;
+        filterArea.width += filterArea.x;
         filterArea.x = 0;
     }
 
diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js
index 3a78624..eb40d8d 100644
--- a/src/core/textures/BaseTexture.js
+++ b/src/core/textures/BaseTexture.js
@@ -254,7 +254,6 @@
             }
         }
     }
-    }
 };
 
 /**
diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js
index 67080f3..8d1e530 100644
--- a/src/extras/TilingSprite.js
+++ b/src/extras/TilingSprite.js
@@ -155,7 +155,7 @@
 
         if (this.tilingTexture && this.tilingTexture.needsUpdate) {
             //TODO - tweaking
-            updateWebGLTexture(this.tilingTexture.baseTexture, renderer.gl);
+            renderer.updateTexture(this.tilingTexture.baseTexture);
             this.tilingTexture.needsUpdate = false;
            // this.tilingTexture._uvs = null;
         }
@@ -226,7 +226,7 @@
     // check blend mode
     if (this.blendMode !== renderer.currentBlendMode) {
         renderer.currentBlendMode = this.blendMode;
-        context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+        context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
     }
 
     var tilePosition = this.tilePosition;

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 29d14a7..7cae0e1 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -100,7 +100,7 @@
         localY = filterArea.y;
 
     if (filterArea.x < 0) {
-        filterArea.x = width += filterArea.x;
+        filterArea.width += filterArea.x;
         filterArea.x = 0;
     }
 
diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js
index 3a78624..eb40d8d 100644
--- a/src/core/textures/BaseTexture.js
+++ b/src/core/textures/BaseTexture.js
@@ -254,7 +254,6 @@
             }
         }
     }
-    }
 };
 
 /**
diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js
index 67080f3..8d1e530 100644
--- a/src/extras/TilingSprite.js
+++ b/src/extras/TilingSprite.js
@@ -155,7 +155,7 @@
 
         if (this.tilingTexture && this.tilingTexture.needsUpdate) {
             //TODO - tweaking
-            updateWebGLTexture(this.tilingTexture.baseTexture, renderer.gl);
+            renderer.updateTexture(this.tilingTexture.baseTexture);
             this.tilingTexture.needsUpdate = false;
            // this.tilingTexture._uvs = null;
         }
@@ -226,7 +226,7 @@
     // check blend mode
     if (this.blendMode !== renderer.currentBlendMode) {
         renderer.currentBlendMode = this.blendMode;
-        context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+        context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
     }
 
     var tilePosition = this.tilePosition;
diff --git a/src/index.js b/src/index.js
index 1448388..927a018 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,6 @@
     filters:        require('./filters'),
     interaction:    require('./interaction'),
     loaders:        require('./loaders'),
-    primitives:     require('./primitives'),
     spine:          require('./spine'),
     text:           require('./text')
 };

diff --git a/.jshintrc b/.jshintrc
index a1e6969..981ab3f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,7 +20,7 @@
     "forin"         : false,    // Disallow `for in` loops without `hasOwnPrototype`.
     "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
     "indent"        : 4,        // Require that 4 spaces are used for indentation.
-    "latedef"       : true,     // Prohibit variable use before definition.
+    "latedef"       : "func",   // Prohibit variable use before definition.
     "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
     "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
     "noempty"       : true,     // Prohibit use of empty blocks.
diff --git a/src/core/display/DisplayObjectContainer.js b/src/core/display/DisplayObjectContainer.js
index 4b0bfc9..47301f8 100644
--- a/src/core/display/DisplayObjectContainer.js
+++ b/src/core/display/DisplayObjectContainer.js
@@ -534,6 +534,8 @@
     var bounds = this.getLocalBounds();
 
     if (!this._cachedSprite) {
+        // TODO - RenderTexture now *requires* a renderer instance, so this is like broken
+        // because `renderer` isn't actually in scope here :P
         var renderTexture = new RenderTexture(renderer, bounds.width | 0, bounds.height | 0);
 
         this._cachedSprite = new Sprite(renderTexture);
diff --git a/src/core/index.js b/src/core/index.js
index e575eb8..950977e 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -21,6 +21,10 @@
     Sprite:                 require('./display/Sprite'),
     SpriteBatch:            require('./display/SpriteBatch'),
 
+    // primitives
+    Graphics:               require('./primitives/Graphics'),
+    GraphicsData:           require('./primitives/GraphicsData'),
+
     // textures
     Texture:                require('./textures/Texture'),
     BaseTexture:            require('./textures/BaseTexture'),
diff --git a/src/core/primitives/Graphics.js b/src/core/primitives/Graphics.js
index b4966a5..88207f4 100644
--- a/src/core/primitives/Graphics.js
+++ b/src/core/primitives/Graphics.js
@@ -660,7 +660,7 @@
         if (this.blendMode !== renderer.spriteBatch.currentBlendMode) {
             renderer.spriteBatch.currentBlendMode = this.blendMode;
 
-            var blendModeWebGL = blendModesWebGL[renderer.spriteBatch.currentBlendMode];
+            var blendModeWebGL = renderer.blendModes[renderer.spriteBatch.currentBlendMode];
 
             renderer.spriteBatch.gl.blendFunc(blendModeWebGL[0], blendModeWebGL[1]);
         }
@@ -734,7 +734,7 @@
 
         if (this.blendMode !== renderer.currentBlendMode) {
             renderer.currentBlendMode = this.blendMode;
-            context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+            context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
         }
 
         if (this._mask) {
diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js
index 29d14a7..7cae0e1 100644
--- a/src/core/renderers/webgl/managers/WebGLFilterManager.js
+++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js
@@ -100,7 +100,7 @@
         localY = filterArea.y;
 
     if (filterArea.x < 0) {
-        filterArea.x = width += filterArea.x;
+        filterArea.width += filterArea.x;
         filterArea.x = 0;
     }
 
diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js
index 3a78624..eb40d8d 100644
--- a/src/core/textures/BaseTexture.js
+++ b/src/core/textures/BaseTexture.js
@@ -254,7 +254,6 @@
             }
         }
     }
-    }
 };
 
 /**
diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js
index 67080f3..8d1e530 100644
--- a/src/extras/TilingSprite.js
+++ b/src/extras/TilingSprite.js
@@ -155,7 +155,7 @@
 
         if (this.tilingTexture && this.tilingTexture.needsUpdate) {
             //TODO - tweaking
-            updateWebGLTexture(this.tilingTexture.baseTexture, renderer.gl);
+            renderer.updateTexture(this.tilingTexture.baseTexture);
             this.tilingTexture.needsUpdate = false;
            // this.tilingTexture._uvs = null;
         }
@@ -226,7 +226,7 @@
     // check blend mode
     if (this.blendMode !== renderer.currentBlendMode) {
         renderer.currentBlendMode = this.blendMode;
-        context.globalCompositeOperation = blendModesCanvas[renderer.currentBlendMode];
+        context.globalCompositeOperation = renderer.blendModes[renderer.currentBlendMode];
     }
 
     var tilePosition = this.tilePosition;
diff --git a/src/index.js b/src/index.js
index 1448388..927a018 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,6 @@
     filters:        require('./filters'),
     interaction:    require('./interaction'),
     loaders:        require('./loaders'),
-    primitives:     require('./primitives'),
     spine:          require('./spine'),
     text:           require('./text')
 };
diff --git a/src/text/BitmapText.js b/src/text/BitmapText.js
index 0fa4f2f..e973630 100644
--- a/src/text/BitmapText.js
+++ b/src/text/BitmapText.js
@@ -130,8 +130,9 @@
         set: function (value) {
             value = value.split(' ');
 
-            this._style.fontName = font[font.length - 1];
-            this._style.fontSize = font.length >= 2 ? parseInt(font[font.length - 2], 10) : BitmapText.fonts[this.fontName].size;
+            // TODO - This should be object-based not string based like it has been.
+            this._style.fontName = value[value.length - 1];
+            this._style.fontSize = value.length >= 2 ? parseInt(value[value.length - 2], 10) : BitmapText.fonts[this.fontName].size;
 
             this.dirty = true;
         }