diff --git a/src/deprecation.js b/src/deprecation.js
index 0131b6b..60d052f 100644
--- a/src/deprecation.js
+++ b/src/deprecation.js
@@ -1,37 +1,37 @@
 var core = require('./core'),
-    math = core.math,
-    // plugins:
-    extras         = require('./extras'),
-    filters        = require('./filters'),
-    interaction    = require('./interaction'),
-    loaders        = require('./loaders'),
-    spine          = require('./spine'),
-    text           = require('./text');
+    text = require('./text');
 
 core.Stage = function ()
 {
-        window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container");
-        return new core.Container();
+    window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container.");
+    return new core.Container();
 };
 
 core.SpriteBatch = function ()
 {
-        window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead");
+    window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead.");
 };
 
-core.Sprite.prototype.setTexture = function ()
-{
-    window.console.warn('setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture; ');
+core.AssetsLoader = function () {
+    window.console.warn("The loader system was overhauled in pixi v3, please see the new PIXI.Loader class.");
 };
 
-text.BitmapText.prototype.setText = function ()
+core.Sprite.prototype.setTexture = function (texture)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text'; ");
+    this.texture = texture;
+    window.console.warn("setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture;");
 };
 
-text.Text.prototype.setText = function ()
+text.BitmapText.prototype.setText = function (text)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myText.text = 'my text'; ");
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text';");
+};
+
+text.Text.prototype.setText = function (text)
+{
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myText.text = 'my text';");
 };
 
 module.exports = {};

diff --git a/src/deprecation.js b/src/deprecation.js
index 0131b6b..60d052f 100644
--- a/src/deprecation.js
+++ b/src/deprecation.js
@@ -1,37 +1,37 @@
 var core = require('./core'),
-    math = core.math,
-    // plugins:
-    extras         = require('./extras'),
-    filters        = require('./filters'),
-    interaction    = require('./interaction'),
-    loaders        = require('./loaders'),
-    spine          = require('./spine'),
-    text           = require('./text');
+    text = require('./text');
 
 core.Stage = function ()
 {
-        window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container");
-        return new core.Container();
+    window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container.");
+    return new core.Container();
 };
 
 core.SpriteBatch = function ()
 {
-        window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead");
+    window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead.");
 };
 
-core.Sprite.prototype.setTexture = function ()
-{
-    window.console.warn('setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture; ');
+core.AssetsLoader = function () {
+    window.console.warn("The loader system was overhauled in pixi v3, please see the new PIXI.Loader class.");
 };
 
-text.BitmapText.prototype.setText = function ()
+core.Sprite.prototype.setTexture = function (texture)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text'; ");
+    this.texture = texture;
+    window.console.warn("setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture;");
 };
 
-text.Text.prototype.setText = function ()
+text.BitmapText.prototype.setText = function (text)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myText.text = 'my text'; ");
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text';");
+};
+
+text.Text.prototype.setText = function (text)
+{
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myText.text = 'my text';");
 };
 
 module.exports = {};
diff --git a/src/extras/cacheAsBitmap.js b/src/extras/cacheAsBitmap.js
index 35ada4d..9fe88df 100644
--- a/src/extras/cacheAsBitmap.js
+++ b/src/extras/cacheAsBitmap.js
@@ -22,7 +22,8 @@
      * Set this to true if you want this display object to be cached as a bitmap.
      * This basically takes a snap shot of the display object as it is at that moment. It can provide a performance benefit for complex static displayObjects.
      * To remove simply set this property to 'null'
-     * @member
+     *
+     * @member {boolean}
      * @memberof DisplayObject#
      */
     cacheAsBitmap: {
@@ -75,6 +76,7 @@
 });
 /**
 * Renders a cached version of the sprite with WebGL
+*
 * @param renderer {WebGLRenderer} the WebGL renderer
 * @private
 */
@@ -90,6 +92,7 @@
 
 /**
 * Prepares the WebGL renderer to cache the sprite
+*
 * @param renderer {WebGLRenderer} the WebGL renderer
 * @private
 */
@@ -150,6 +153,7 @@
 
 /**
 * Renders a cached version of the sprite with canvas
+*
 * @param renderer {CanvasRenderer} the Canvas renderer
 * @private
 */
@@ -165,6 +169,7 @@
 //TODO this can be the same as the webGL verison.. will need to do a little tweaking first though..
 /**
 * Prepares the Canvas renderer to cache the sprite
+*
 * @param renderer {CanvasRenderer} the Canvas renderer
 * @private
 */

diff --git a/src/deprecation.js b/src/deprecation.js
index 0131b6b..60d052f 100644
--- a/src/deprecation.js
+++ b/src/deprecation.js
@@ -1,37 +1,37 @@
 var core = require('./core'),
-    math = core.math,
-    // plugins:
-    extras         = require('./extras'),
-    filters        = require('./filters'),
-    interaction    = require('./interaction'),
-    loaders        = require('./loaders'),
-    spine          = require('./spine'),
-    text           = require('./text');
+    text = require('./text');
 
 core.Stage = function ()
 {
-        window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container");
-        return new core.Container();
+    window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container.");
+    return new core.Container();
 };
 
 core.SpriteBatch = function ()
 {
-        window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead");
+    window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead.");
 };
 
-core.Sprite.prototype.setTexture = function ()
-{
-    window.console.warn('setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture; ');
+core.AssetsLoader = function () {
+    window.console.warn("The loader system was overhauled in pixi v3, please see the new PIXI.Loader class.");
 };
 
-text.BitmapText.prototype.setText = function ()
+core.Sprite.prototype.setTexture = function (texture)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text'; ");
+    this.texture = texture;
+    window.console.warn("setTexture is now deprecated, please use the texture property, e.g : sprite.texture = texture;");
 };
 
-text.Text.prototype.setText = function ()
+text.BitmapText.prototype.setText = function (text)
 {
-    window.console.warn(" setText is now deprecated, please use the text property, e.g : myText.text = 'my text'; ");
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myBitmapText.text = 'my text';");
+};
+
+text.Text.prototype.setText = function (text)
+{
+    this.text = text;
+    window.console.warn("setText is now deprecated, please use the text property, e.g : myText.text = 'my text';");
 };
 
 module.exports = {};
diff --git a/src/extras/cacheAsBitmap.js b/src/extras/cacheAsBitmap.js
index 35ada4d..9fe88df 100644
--- a/src/extras/cacheAsBitmap.js
+++ b/src/extras/cacheAsBitmap.js
@@ -22,7 +22,8 @@
      * Set this to true if you want this display object to be cached as a bitmap.
      * This basically takes a snap shot of the display object as it is at that moment. It can provide a performance benefit for complex static displayObjects.
      * To remove simply set this property to 'null'
-     * @member
+     *
+     * @member {boolean}
      * @memberof DisplayObject#
      */
     cacheAsBitmap: {
@@ -75,6 +76,7 @@
 });
 /**
 * Renders a cached version of the sprite with WebGL
+*
 * @param renderer {WebGLRenderer} the WebGL renderer
 * @private
 */
@@ -90,6 +92,7 @@
 
 /**
 * Prepares the WebGL renderer to cache the sprite
+*
 * @param renderer {WebGLRenderer} the WebGL renderer
 * @private
 */
@@ -150,6 +153,7 @@
 
 /**
 * Renders a cached version of the sprite with canvas
+*
 * @param renderer {CanvasRenderer} the Canvas renderer
 * @private
 */
@@ -165,6 +169,7 @@
 //TODO this can be the same as the webGL verison.. will need to do a little tweaking first though..
 /**
 * Prepares the Canvas renderer to cache the sprite
+*
 * @param renderer {CanvasRenderer} the Canvas renderer
 * @private
 */
diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js
index 28ba7ee..f0551a1 100644
--- a/src/loaders/bitmapFontParser.js
+++ b/src/loaders/bitmapFontParser.js
@@ -85,6 +85,8 @@
 
             resource.bitmapFont = data;
 
+            // I'm leaving this as a temporary fix so we can test the bitmap fonts in v3
+            // but it's very likely to change
             text.BitmapText.fonts[data.font] = data;
 
             next();