diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)
diff --git a/src/pixi/renderers/webgl/utils/FilterTexture.js b/src/pixi/renderers/webgl/utils/FilterTexture.js
index 45cb76f..0340289 100644
--- a/src/pixi/renderers/webgl/utils/FilterTexture.js
+++ b/src/pixi/renderers/webgl/utils/FilterTexture.js
@@ -8,7 +8,7 @@
 * @param gl {WebGLContext} the current WebGL drawing context
 * @param width {Number} the horizontal range of the filter
 * @param height {Number} the vertical range of the filter
-* @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
 */
 PIXI.FilterTexture = function(gl, width, height, scaleMode)
 {

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)
diff --git a/src/pixi/renderers/webgl/utils/FilterTexture.js b/src/pixi/renderers/webgl/utils/FilterTexture.js
index 45cb76f..0340289 100644
--- a/src/pixi/renderers/webgl/utils/FilterTexture.js
+++ b/src/pixi/renderers/webgl/utils/FilterTexture.js
@@ -8,7 +8,7 @@
 * @param gl {WebGLContext} the current WebGL drawing context
 * @param width {Number} the horizontal range of the filter
 * @param height {Number} the vertical range of the filter
-* @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
 */
 PIXI.FilterTexture = function(gl, width, height, scaleMode)
 {
diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js
index f78fe9a..6fb2b25 100644
--- a/src/pixi/textures/BaseTexture.js
+++ b/src/pixi/textures/BaseTexture.js
@@ -13,7 +13,7 @@
  * @uses EventTarget
  * @constructor
  * @param source {String} the source object (image or canvas)
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  */
 PIXI.BaseTexture = function(source, scaleMode)
 {
@@ -233,7 +233,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -273,7 +273,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)
diff --git a/src/pixi/renderers/webgl/utils/FilterTexture.js b/src/pixi/renderers/webgl/utils/FilterTexture.js
index 45cb76f..0340289 100644
--- a/src/pixi/renderers/webgl/utils/FilterTexture.js
+++ b/src/pixi/renderers/webgl/utils/FilterTexture.js
@@ -8,7 +8,7 @@
 * @param gl {WebGLContext} the current WebGL drawing context
 * @param width {Number} the horizontal range of the filter
 * @param height {Number} the vertical range of the filter
-* @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
 */
 PIXI.FilterTexture = function(gl, width, height, scaleMode)
 {
diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js
index f78fe9a..6fb2b25 100644
--- a/src/pixi/textures/BaseTexture.js
+++ b/src/pixi/textures/BaseTexture.js
@@ -13,7 +13,7 @@
  * @uses EventTarget
  * @constructor
  * @param source {String} the source object (image or canvas)
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  */
 PIXI.BaseTexture = function(source, scaleMode)
 {
@@ -233,7 +233,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -273,7 +273,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)
diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js
index fe4e2a2..37dd7c8 100644
--- a/src/pixi/textures/RenderTexture.js
+++ b/src/pixi/textures/RenderTexture.js
@@ -29,7 +29,7 @@
  * @param width {Number} The width of the render texture
  * @param height {Number} The height of the render texture
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used for this RenderTexture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param resolution {Number} The resolution of the texture being generated
  */
 PIXI.RenderTexture = function(width, height, renderer, scaleMode, resolution)

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)
diff --git a/src/pixi/renderers/webgl/utils/FilterTexture.js b/src/pixi/renderers/webgl/utils/FilterTexture.js
index 45cb76f..0340289 100644
--- a/src/pixi/renderers/webgl/utils/FilterTexture.js
+++ b/src/pixi/renderers/webgl/utils/FilterTexture.js
@@ -8,7 +8,7 @@
 * @param gl {WebGLContext} the current WebGL drawing context
 * @param width {Number} the horizontal range of the filter
 * @param height {Number} the vertical range of the filter
-* @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
 */
 PIXI.FilterTexture = function(gl, width, height, scaleMode)
 {
diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js
index f78fe9a..6fb2b25 100644
--- a/src/pixi/textures/BaseTexture.js
+++ b/src/pixi/textures/BaseTexture.js
@@ -13,7 +13,7 @@
  * @uses EventTarget
  * @constructor
  * @param source {String} the source object (image or canvas)
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  */
 PIXI.BaseTexture = function(source, scaleMode)
 {
@@ -233,7 +233,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -273,7 +273,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)
diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js
index fe4e2a2..37dd7c8 100644
--- a/src/pixi/textures/RenderTexture.js
+++ b/src/pixi/textures/RenderTexture.js
@@ -29,7 +29,7 @@
  * @param width {Number} The width of the render texture
  * @param height {Number} The height of the render texture
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used for this RenderTexture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param resolution {Number} The resolution of the texture being generated
  */
 PIXI.RenderTexture = function(width, height, renderer, scaleMode, resolution)
diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js
index ae0059f..6628e57 100644
--- a/src/pixi/textures/Texture.js
+++ b/src/pixi/textures/Texture.js
@@ -232,7 +232,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return Texture
  */
 PIXI.Texture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -270,7 +270,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return Texture
  */
 PIXI.Texture.fromCanvas = function(canvas, scaleMode)

diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
index 66cae42..4e259a6 100644
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@@ -19,13 +19,13 @@
 var PIXI = PIXI || {};
 
 /**
- * @property {Integer} WEBGL_RENDERER
+ * @property {Number} WEBGL_RENDERER
  * @protected
  * @static 
  */
 PIXI.WEBGL_RENDERER = 0;
 /**
- * @property {Integer} CANVAS_RENDERER
+ * @property {Number} CANVAS_RENDERER
  * @protected
  * @static
  */
@@ -41,23 +41,23 @@
 /**
  * Various blend modes supported by pixi.
  * @property {Object} blendModes
- * @property {Integer} blendModes.NORMAL
- * @property {Integer} blendModes.ADD
- * @property {Integer} blendModes.MULTIPLY
- * @property {Integer} blendModes.SCREEN
- * @property {Integer} blendModes.OVERLAY
- * @property {Integer} blendModes.DARKEN
- * @property {Integer} blendModes.LIGHTEN
- * @property {Integer} blendModes.COLOR_DODGE
- * @property {Integer} blendModes.COLOR_BURN
- * @property {Integer} blendModes.HARD_LIGHT
- * @property {Integer} blendModes.SOFT_LIGHT
- * @property {Integer} blendModes.DIFFERENCE
- * @property {Integer} blendModes.EXCLUSION
- * @property {Integer} blendModes.HUE
- * @property {Integer} blendModes.SATURATION
- * @property {Integer} blendModes.COLOR
- * @property {Integer} blendModes.LUMINOSITY
+ * @property {Number} blendModes.NORMAL
+ * @property {Number} blendModes.ADD
+ * @property {Number} blendModes.MULTIPLY
+ * @property {Number} blendModes.SCREEN
+ * @property {Number} blendModes.OVERLAY
+ * @property {Number} blendModes.DARKEN
+ * @property {Number} blendModes.LIGHTEN
+ * @property {Number} blendModes.COLOR_DODGE
+ * @property {Number} blendModes.COLOR_BURN
+ * @property {Number} blendModes.HARD_LIGHT
+ * @property {Number} blendModes.SOFT_LIGHT
+ * @property {Number} blendModes.DIFFERENCE
+ * @property {Number} blendModes.EXCLUSION
+ * @property {Number} blendModes.HUE
+ * @property {Number} blendModes.SATURATION
+ * @property {Number} blendModes.COLOR
+ * @property {Number} blendModes.LUMINOSITY
  * @static
  */
 PIXI.blendModes = {
@@ -83,13 +83,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The DEFAULT scale mode affects the default scaling mode of future operrations.
- * It can be user-reassigned to either LINEAR or NEAREST, depending upon need.
+ * The DEFAULT scale mode affects the default scaling mode of future operations.
+ * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @property {Object} scaleModes
- * @property {Integer} scaleModes.DEFAULT=LINEAR
- * @property {Integer} scaleModes.LINEAR Smooth scaling
- * @property {Integer} scaleModes.NEAREST Pixelating scaling
+ * @property {Number} scaleModes.DEFAULT=LINEAR
+ * @property {Number} scaleModes.LINEAR Smooth scaling
+ * @property {Number} scaleModes.NEAREST Pixelating scaling
  * @static
  */
 PIXI.scaleModes = {
diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js
index d23c2a8..3b277c6 100755
--- a/src/pixi/display/DisplayObject.js
+++ b/src/pixi/display/DisplayObject.js
@@ -562,7 +562,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used to generate the texture.
  * @return {Texture} a texture of the graphics object
  */
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
index 4fc93bc..948e351 100644
--- a/src/pixi/primitives/Graphics.js
+++ b/src/pixi/primitives/Graphics.js
@@ -638,7 +638,7 @@
  *
  * @method generateTexture
  * @param resolution {Number} The resolution of the texture being generated
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return {Texture} a texture of the graphics object
  */
 PIXI.Graphics.prototype.generateTexture = function(resolution, scaleMode)
diff --git a/src/pixi/renderers/webgl/utils/FilterTexture.js b/src/pixi/renderers/webgl/utils/FilterTexture.js
index 45cb76f..0340289 100644
--- a/src/pixi/renderers/webgl/utils/FilterTexture.js
+++ b/src/pixi/renderers/webgl/utils/FilterTexture.js
@@ -8,7 +8,7 @@
 * @param gl {WebGLContext} the current WebGL drawing context
 * @param width {Number} the horizontal range of the filter
 * @param height {Number} the vertical range of the filter
-* @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
 */
 PIXI.FilterTexture = function(gl, width, height, scaleMode)
 {
diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js
index f78fe9a..6fb2b25 100644
--- a/src/pixi/textures/BaseTexture.js
+++ b/src/pixi/textures/BaseTexture.js
@@ -13,7 +13,7 @@
  * @uses EventTarget
  * @constructor
  * @param source {String} the source object (image or canvas)
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  */
 PIXI.BaseTexture = function(source, scaleMode)
 {
@@ -233,7 +233,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -273,7 +273,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return BaseTexture
  */
 PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)
diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js
index fe4e2a2..37dd7c8 100644
--- a/src/pixi/textures/RenderTexture.js
+++ b/src/pixi/textures/RenderTexture.js
@@ -29,7 +29,7 @@
  * @param width {Number} The width of the render texture
  * @param height {Number} The height of the render texture
  * @param renderer {CanvasRenderer|WebGLRenderer} The renderer used for this RenderTexture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @param resolution {Number} The resolution of the texture being generated
  */
 PIXI.RenderTexture = function(width, height, renderer, scaleMode, resolution)
diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js
index ae0059f..6628e57 100644
--- a/src/pixi/textures/Texture.js
+++ b/src/pixi/textures/Texture.js
@@ -232,7 +232,7 @@
  * @method fromImage
  * @param imageUrl {String} The image url of the texture
  * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return Texture
  */
 PIXI.Texture.fromImage = function(imageUrl, crossorigin, scaleMode)
@@ -270,7 +270,7 @@
  * @static
  * @method fromCanvas
  * @param canvas {Canvas} The canvas element source of the texture
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  * @return Texture
  */
 PIXI.Texture.fromCanvas = function(canvas, scaleMode)
diff --git a/src/pixi/textures/VideoTexture.js b/src/pixi/textures/VideoTexture.js
index ab73e5e..906ae49 100644
--- a/src/pixi/textures/VideoTexture.js
+++ b/src/pixi/textures/VideoTexture.js
@@ -7,7 +7,7 @@
  * @extends BaseTexture
  * @constructor
  * @param source {HTMLVideoElement}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
  */
 PIXI.VideoTexture = function( source, scaleMode )
 {
@@ -110,11 +110,11 @@
 /**
  * Mimic Pixi BaseTexture.from.... method.
  *
- * @name baseTextureFromVideo
  * @static
+ * @method baseTextureFromVideo
  * @param video {HTMLVideoElement}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
- * @returns {PIXI.VideoTexture}
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
+ * @returns {VideoTexture}
  */
 PIXI.VideoTexture.baseTextureFromVideo = function( video, scaleMode )
 {
@@ -137,11 +137,11 @@
 /**
  * Mimic Pixi BaseTexture.from.... method.
  *
- * @name textureFromVideo
  * @static
+ * @method textureFromVideo 
  * @param video {HTMLVideoElement}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
- * @returns {PIXI.Texture}
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
+ * @returns {Texture} A Texture, but not a VideoTexture.
  */
 PIXI.VideoTexture.textureFromVideo = function( video, scaleMode )
 {
@@ -152,11 +152,11 @@
 /**
  * Mimic Pixi BaseTexture.from.... method.
  *
- * @name fromUrl
  * @static
- * @param videoSrc {Url}
- * @param scaleMode {Integer} See {{#crossLink "PIXI/scaleModes:property"}}{{/crossLink}} for possible values
- * @returns {PIXI.Texture}
+ * @method fromUrl 
+ * @param videoSrc {String} The URL for the video.
+ * @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
+ * @returns {VideoTexture}
  */
 PIXI.VideoTexture.fromUrl = function( videoSrc, scaleMode )
 {