diff --git a/src/renderer/webgl/WebGLPipeline.js b/src/renderer/webgl/WebGLPipeline.js
index b4464f960..851843bb0 100644
--- a/src/renderer/webgl/WebGLPipeline.js
+++ b/src/renderer/webgl/WebGLPipeline.js
@@ -82,7 +82,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#gl
-         * @type {[type]}
+         * @type {WebGLRenderingContext}
          * @since 3.0.0
          */
         this.gl = config.gl;
@@ -119,7 +119,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#vertexData
-         * @type {[type]}
+         * @type {ArrayBuffer}
          * @since 3.0.0
          */
         this.vertexData = (config.vertices ? config.vertices : new ArrayBuffer(config.vertexCapacity * config.vertexSize));
@@ -128,7 +128,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#vertexBuffer
-         * @type {[type]}
+         * @type {WebGLBuffer}
          * @since 3.0.0
          */
         this.vertexBuffer = this.renderer.createVertexBuffer((config.vertices ? config.vertices : this.vertexData.byteLength), this.gl.STREAM_DRAW);
@@ -137,7 +137,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#program
-         * @type {[type]}
+         * @type {WebGLProgram}
          * @since 3.0.0
          */
         this.program = this.renderer.createProgram(config.vertShader, config.fragShader);
@@ -146,7 +146,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#attributes
-         * @type {[type]}
+         * @type {object}
          * @since 3.0.0
          */
         this.attributes = config.attributes;
@@ -155,7 +155,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#vertexSize
-         * @type {[type]}
+         * @type {int}
          * @since 3.0.0
          */
         this.vertexSize = config.vertexSize;
@@ -164,7 +164,7 @@ var WebGLPipeline = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#topology
-         * @type {[type]}
+         * @type {int}
          * @since 3.0.0
          */
         this.topology = config.topology;
@@ -182,7 +182,7 @@ var WebGLPipeline = new Class({
          * This will store the amount of components of 32 bit length
          *
          * @name Phaser.Renderer.WebGL.WebGLPipeline#vertexComponentCount
-         * @type {[type]}
+         * @type {int}
          * @since 3.0.0
          */
         this.vertexComponentCount = Utils.getComponentCount(config.attributes);
diff --git a/src/renderer/webgl/WebGLRenderer.js b/src/renderer/webgl/WebGLRenderer.js
index cd669bd44..92bba96dc 100644
--- a/src/renderer/webgl/WebGLRenderer.js
+++ b/src/renderer/webgl/WebGLRenderer.js
@@ -159,7 +159,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#pipelines
-         * @type {?[type]}
+         * @type {object}
          * @default null
          * @since 3.0.0
          */
@@ -193,7 +193,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentTextures
-         * @type {[type]}
+         * @type {array}
          * @since 3.0.0
          */
         this.currentTextures = new Array(16);
@@ -202,7 +202,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentFramebuffer
-         * @type {?[type]}
+         * @type {WebGLFramebuffer}
          * @default null
          * @since 3.0.0
          */
@@ -212,7 +212,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentPipeline
-         * @type {?[type]}
+         * @type {Phaser.Renderer.WebGL.WebGLPipeline}
          * @default null
          * @since 3.0.0
          */
@@ -222,7 +222,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentProgram
-         * @type {?[type]}
+         * @type {WebGLProgram}
          * @default null
          * @since 3.0.0
          */
@@ -232,7 +232,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentVertexBuffer
-         * @type {?[type]}
+         * @type {WebGLBuffer}
          * @default null
          * @since 3.0.0
          */
@@ -242,7 +242,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentIndexBuffer
-         * @type {?[type]}
+         * @type {WebGLBuffer}
          * @default null
          * @since 3.0.0
          */
@@ -252,7 +252,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#currentBlendMode
-         * @type {[type]}
+         * @type {int}
          * @since 3.0.0
          */
         this.currentBlendMode = Infinity;
@@ -324,7 +324,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#gl
-         * @type {?[type]}
+         * @type {WebGLRenderingContext}
          * @default null
          * @since 3.0.0
          */
@@ -334,7 +334,7 @@ var WebGLRenderer = new Class({
          * [description]
          *
          * @name Phaser.Renderer.WebGL.WebGLRenderer#supportedExtensions
-         * @type {?[type]}
+         * @type {object}
          * @default null
          * @since 3.0.0
          */
@@ -454,7 +454,7 @@ var WebGLRenderer = new Class({
      * @since 3.0.0
      *
      * @param {function} callback - [description]
-     * @param {[type]} target - [description]
+     * @param {object} target - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -471,7 +471,7 @@ var WebGLRenderer = new Class({
      * @since 3.0.0
      *
      * @param {function} callback - [description]
-     * @param {[type]} target - [description]
+     * @param {object} target - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -487,7 +487,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#hasExtension
      * @since 3.0.0
      *
-     * @param {[type]} extensionName - [description]
+     * @param {string} extensionName - [description]
      *
      * @return {boolean} [description]
      */
@@ -502,9 +502,9 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#getExtension
      * @since 3.0.0
      *
-     * @param {[type]} extensionName - [description]
+     * @param {string} extensionName - [description]
      *
-     * @return {[type]} [description]
+     * @return {object} [description]
      */
     getExtension: function (extensionName)
     {
@@ -540,7 +540,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#hasPipeline
      * @since 3.0.0
      *
-     * @param {[type]} pipelineName - [description]
+     * @param {string} pipelineName - [description]
      *
      * @return {boolean} [description]
      */
@@ -555,9 +555,9 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#getPipeline
      * @since 3.0.0
      *
-     * @param {[type]} pipelineName - [description]
+     * @param {string} pipelineName - [description]
      *
-     * @return {[type]} [description]
+     * @return {Phaser.Renderer.WebGL.WebGLPipeline} [description]
      */
     getPipeline: function (pipelineName)
     {
@@ -570,7 +570,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#removePipeline
      * @since 3.0.0
      *
-     * @param {[type]} pipelineName - [description]
+     * @param {string} pipelineName - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -586,8 +586,8 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#addPipeline
      * @since 3.0.0
      *
-     * @param {[type]} pipelineName - [description]
-     * @param {[type]} pipelineInstance - [description]
+     * @param {string} pipelineName - [description]
+     * @param {Phaser.Renderer.WebGL.WebGLPipeline} pipelineInstance - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -608,10 +608,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setScissor
      * @since 3.0.0
      *
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} w - [description]
-     * @param {[type]} h - [description]
+     * @param {int} x - [description]
+     * @param {int} y - [description]
+     * @param {int} w - [description]
+     * @param {int} h - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -654,10 +654,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#pushScissor
      * @since 3.0.0
      *
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} w - [description]
-     * @param {[type]} h - [description]
+     * @param {int} x - [description]
+     * @param {int} y - [description]
+     * @param {int} w - [description]
+     * @param {int} h - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -708,9 +708,9 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setPipeline
      * @since 3.0.0
      *
-     * @param {[type]} pipelineInstance - [description]
+     * @param {Phaser.Renderer.WebGL.WebGLPipeline} pipelineInstance - [description]
      *
-     * @return {[type]} [description]
+     * @return {Phaser.Renderer.WebGL.WebGLPipeline} [description]
      */
     setPipeline: function (pipelineInstance)
     {
@@ -734,7 +734,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setBlendMode
      * @since 3.0.0
      *
-     * @param {[type]} blendModeId - [description]
+     * @param {int} blendModeId - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -772,8 +772,8 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setTexture2D
      * @since 3.0.0
      *
-     * @param {[type]} texture - [description]
-     * @param {[type]} textureUnit - [description]
+     * @param {WebGLTexture} texture - [description]
+     * @param {int} textureUnit - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -800,7 +800,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setFramebuffer
      * @since 3.0.0
      *
-     * @param {[type]} framebuffer - [description]
+     * @param {WebGLFramebuffer} framebuffer - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -825,7 +825,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setProgram
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
+     * @param {WebGLProgram} program - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -850,7 +850,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setVertexBuffer
      * @since 3.0.0
      *
-     * @param {[type]} vertexBuffer - [description]
+     * @param {WebGLBuffer} vertexBuffer - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -875,7 +875,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setIndexBuffer
      * @since 3.0.0
      *
-     * @param {[type]} indexBuffer - [description]
+     * @param {WebGLBuffer} indexBuffer - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -901,12 +901,12 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createTextureFromSource
      * @since 3.0.0
      *
-     * @param {[type]} source - [description]
-     * @param {[type]} width - [description]
-     * @param {[type]} height - [description]
-     * @param {[type]} scaleMode - [description]
+     * @param {object} source - [description]
+     * @param {int} width - [description]
+     * @param {int} height - [description]
+     * @param {int} scaleMode - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLTexture} [description]
      */
     createTextureFromSource: function (source, width, height, scaleMode)
     {   
@@ -950,18 +950,18 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createTexture2D
      * @since 3.0.0
      *
-     * @param {[type]} mipLevel - [description]
-     * @param {[type]} minFilter - [description]
-     * @param {[type]} magFilter - [description]
-     * @param {[type]} wrapT - [description]
-     * @param {[type]} wrapS - [description]
-     * @param {[type]} format - [description]
-     * @param {[type]} pixels - [description]
-     * @param {[type]} width - [description]
-     * @param {[type]} height - [description]
-     * @param {[type]} pma - [description]
+     * @param {int} mipLevel - [description]
+     * @param {int} minFilter - [description]
+     * @param {int} magFilter - [description]
+     * @param {int} wrapT - [description]
+     * @param {int} wrapS - [description]
+     * @param {int} format - [description]
+     * @param {object} pixels - [description]
+     * @param {int} width - [description]
+     * @param {int} height - [description]
+     * @param {boolean} pma - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLTexture} [description]
      */
     createTexture2D: function (mipLevel, minFilter, magFilter, wrapT, wrapS, format, pixels, width, height, pma)
     {
@@ -1007,12 +1007,12 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createFramebuffer
      * @since 3.0.0
      *
-     * @param {[type]} width - [description]
-     * @param {[type]} height - [description]
-     * @param {[type]} renderTexture - [description]
-     * @param {[type]} addDepthStencilBuffer - [description]
+     * @param {int} width - [description]
+     * @param {int} height - [description]
+     * @param {WebGLFramebuffer} renderTexture - [description]
+     * @param {boolean} addDepthStencilBuffer - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLFramebuffer} [description]
      */
     createFramebuffer: function (width, height, renderTexture, addDepthStencilBuffer)
     {
@@ -1061,10 +1061,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createProgram
      * @since 3.0.0
      *
-     * @param {[type]} vertexShader - [description]
-     * @param {[type]} fragmentShader - [description]
+     * @param {string} vertexShader - [description]
+     * @param {string} fragmentShader - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLProgram} [description]
      */
     createProgram: function (vertexShader, fragmentShader)
     {
@@ -1105,10 +1105,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createVertexBuffer
      * @since 3.0.0
      *
-     * @param {[type]} initialDataOrSize - [description]
-     * @param {[type]} bufferUsage - [description]
+     * @param {ArrayBuffer} initialDataOrSize - [description]
+     * @param {int} bufferUsage - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLBuffer} [description]
      */
     createVertexBuffer: function (initialDataOrSize, bufferUsage)
     {
@@ -1128,10 +1128,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#createIndexBuffer
      * @since 3.0.0
      *
-     * @param {[type]} initialDataOrSize - [description]
-     * @param {[type]} bufferUsage - [description]
+     * @param {ArrayBuffer} initialDataOrSize - [description]
+     * @param {int} bufferUsage - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLBuffer} [description]
      */
     createIndexBuffer: function (initialDataOrSize, bufferUsage)
     {
@@ -1151,7 +1151,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#deleteTexture
      * @since 3.0.0
      *
-     * @param {[type]} texture - [description]
+     * @param {WebGLTexture} texture - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1166,7 +1166,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#deleteFramebuffer
      * @since 3.0.0
      *
-     * @param {[type]} framebuffer - [description]
+     * @param {WebGLFramebuffer} framebuffer - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1181,7 +1181,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#deleteProgram
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
+     * @param {WebGLProgram} program - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1196,7 +1196,7 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#deleteBuffer
      * @since 3.0.0
      *
-     * @param {[type]} vertexBuffer - [description]
+     * @param {WebGLBuffer} vertexBuffer - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1312,7 +1312,7 @@ var WebGLRenderer = new Class({
      * @since 3.0.0
      *
      * @param {Phaser.Scene} scene - [description]
-     * @param {[type]} children - [description]
+     * @param {Phaser.GameObjects.GameObject} children - [description]
      * @param {number} interpolationPercentage - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
@@ -1397,8 +1397,8 @@ var WebGLRenderer = new Class({
      * @since 3.0.0
      *
      * @param {function} callback - [description]
-     * @param {[type]} type - [description]
-     * @param {[type]} encoderOptions - [description]
+     * @param {string} type - [description]
+     * @param {float} encoderOptions - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1416,12 +1416,12 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#canvasToTexture
      * @since 3.0.0
      *
-     * @param {[type]} srcCanvas - [description]
-     * @param {[type]} dstTexture - [description]
-     * @param {[type]} shouldReallocate - [description]
-     * @param {[type]} scaleMode - [description]
+     * @param {HTMLCanvasElement} srcCanvas - [description]
+     * @param {WebGLTexture} dstTexture - [description]
+     * @param {boolean} shouldReallocate - [description]
+     * @param {int} scaleMode - [description]
      *
-     * @return {[type]} [description]
+     * @return {WebGLTexture} [description]
      */
     canvasToTexture: function (srcCanvas, dstTexture, shouldReallocate, scaleMode)
     {
@@ -1465,8 +1465,8 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setTextureFilter
      * @since 3.0.0
      *
-     * @param {[type]} texture - [description]
-     * @param {[type]} filter - [description]
+     * @param {int} texture - [description]
+     * @param {int} filter - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1491,9 +1491,9 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setFloat1
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {float} x - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1510,10 +1510,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setFloat2
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {float} x - [description]
+     * @param {float} y - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1530,11 +1530,11 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setFloat3
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} z - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {float} x - [description]
+     * @param {float} y - [description]
+     * @param {float} z - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1551,12 +1551,12 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setFloat4
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} z - [description]
-     * @param {[type]} w - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {float} x - [description]
+     * @param {float} y - [description]
+     * @param {float} z - [description]
+     * @param {float} w - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1573,9 +1573,9 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setInt1
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {int} x - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1592,10 +1592,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setInt2
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {int} x - [description]
+     * @param {int} y - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1612,11 +1612,11 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setInt3
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} z - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {int} x - [description]
+     * @param {int} y - [description]
+     * @param {int} z - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1633,12 +1633,12 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setInt4
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} z - [description]
-     * @param {[type]} w - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {int} x - [description]
+     * @param {int} y - [description]
+     * @param {int} z - [description]
+     * @param {int} w - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1655,10 +1655,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setMatrix2
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} transpose - [description]
-     * @param {[type]} matrix - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {boolean} transpose - [description]
+     * @param {Float32Array} matrix - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1675,10 +1675,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setMatrix3
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} transpose - [description]
-     * @param {[type]} matrix - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {boolean} transpose - [description]
+     * @param {Float32Array} matrix - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
@@ -1695,10 +1695,10 @@ var WebGLRenderer = new Class({
      * @method Phaser.Renderer.WebGL.WebGLRenderer#setMatrix4
      * @since 3.0.0
      *
-     * @param {[type]} program - [description]
-     * @param {[type]} name - [description]
-     * @param {[type]} transpose - [description]
-     * @param {[type]} matrix - [description]
+     * @param {WebGLProgram} program - [description]
+     * @param {string} name - [description]
+     * @param {boolean} transpose - [description]
+     * @param {Float32Array} matrix - [description]
      *
      * @return {Phaser.Renderer.WebGL.WebGLRenderer} [description]
      */
diff --git a/src/renderer/webgl/pipelines/BitmapMaskPipeline.js b/src/renderer/webgl/pipelines/BitmapMaskPipeline.js
index ab045d517..2c9040d07 100644
--- a/src/renderer/webgl/pipelines/BitmapMaskPipeline.js
+++ b/src/renderer/webgl/pipelines/BitmapMaskPipeline.js
@@ -21,7 +21,7 @@ var WebGLPipeline = require('../WebGLPipeline');
  * @since 3.0.0
  *
  * @param {Phaser.Game} game - [description]
- * @param {[type]} gl - [description]
+ * @param {WebGLRenderingContext} gl - [description]
  * @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - [description]
  */
 var BitmapMaskPipeline = new Class({
@@ -140,8 +140,8 @@ var BitmapMaskPipeline = new Class({
      * @method Phaser.Renderer.WebGL.BitmapMaskPipeline#beginMask
      * @since 3.0.0
      *
-     * @param {[type]} mask - [description]
-     * @param {[type]} maskedObject - [description]
+     * @param {Phaser.GameObjects.GameObject} mask - [description]
+     * @param {Phaser.GameObjects.GameObject} maskedObject - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     beginMask: function (mask, maskedObject, camera)
@@ -177,7 +177,7 @@ var BitmapMaskPipeline = new Class({
      * @method Phaser.Renderer.WebGL.BitmapMaskPipeline#endMask
      * @since 3.0.0
      *
-     * @param {[type]} mask - [description]
+     * @param {Phaser.GameObjects.GameObject} mask - [description]
      */
     endMask: function (mask)
     {
diff --git a/src/renderer/webgl/pipelines/FlatTintPipeline.js b/src/renderer/webgl/pipelines/FlatTintPipeline.js
index 668f28465..c56b04db4 100644
--- a/src/renderer/webgl/pipelines/FlatTintPipeline.js
+++ b/src/renderer/webgl/pipelines/FlatTintPipeline.js
@@ -45,7 +45,7 @@ var pathArray = [];
  * @since 3.0.0
  *
  * @param {Phaser.Game} game - [description]
- * @param {[type]} gl - [description]
+ * @param {WebGLRenderingContext} gl - [description]
  * @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - [description]
  */
 var FlatTintPipeline = new Class({
@@ -178,25 +178,25 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchFillRect
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} x - [description]
-     * @param {[type]} y - [description]
-     * @param {[type]} width - [description]
-     * @param {[type]} height - [description]
-     * @param {[type]} fillColor - [description]
-     * @param {[type]} fillAlpha - [description]
-     * @param {[type]} a1 - [description]
-     * @param {[type]} b1 - [description]
-     * @param {[type]} c1 - [description]
-     * @param {[type]} d1 - [description]
-     * @param {[type]} e1 - [description]
-     * @param {[type]} f1 - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {float} x - [description]
+     * @param {float} y - [description]
+     * @param {float} width - [description]
+     * @param {float} height - [description]
+     * @param {int} fillColor - [description]
+     * @param {float} fillAlpha - [description]
+     * @param {float} a1 - [description]
+     * @param {float} b1 - [description]
+     * @param {float} c1 - [description]
+     * @param {float} d1 - [description]
+     * @param {float} e1 - [description]
+     * @param {float} f1 - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchFillRect: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, x, y, width, height, fillColor, fillAlpha, a1, b1, c1, d1, e1, f1, currentMatrix, roundPixels)
     {        
@@ -276,27 +276,27 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchFillTriangle
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} x0 - [description]
-     * @param {[type]} y0 - [description]
-     * @param {[type]} x1 - [description]
-     * @param {[type]} y1 - [description]
-     * @param {[type]} x2 - [description]
-     * @param {[type]} y2 - [description]
-     * @param {[type]} fillColor - [description]
-     * @param {[type]} fillAlpha - [description]
-     * @param {[type]} a1 - [description]
-     * @param {[type]} b1 - [description]
-     * @param {[type]} c1 - [description]
-     * @param {[type]} d1 - [description]
-     * @param {[type]} e1 - [description]
-     * @param {[type]} f1 - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {float} x0 - [description]
+     * @param {float} y0 - [description]
+     * @param {float} x1 - [description]
+     * @param {float} y1 - [description]
+     * @param {float} x2 - [description]
+     * @param {float} y2 - [description]
+     * @param {int} fillColor - [description]
+     * @param {float} fillAlpha - [description]
+     * @param {float} a1 - [description]
+     * @param {float} b1 - [description]
+     * @param {float} c1 - [description]
+     * @param {float} d1 - [description]
+     * @param {float} e1 - [description]
+     * @param {float} f1 - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchFillTriangle: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, x0, y0, x1, y1, x2, y2, fillColor, fillAlpha, a1, b1, c1, d1, e1, f1, currentMatrix, roundPixels)
     {
@@ -361,28 +361,28 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchStrokeTriangle
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} x0 - [description]
-     * @param {[type]} y0 - [description]
-     * @param {[type]} x1 - [description]
-     * @param {[type]} y1 - [description]
-     * @param {[type]} x2 - [description]
-     * @param {[type]} y2 - [description]
-     * @param {[type]} lineWidth - [description]
-     * @param {[type]} lineColor - [description]
-     * @param {[type]} lineAlpha - [description]
-     * @param {[type]} a - [description]
-     * @param {[type]} b - [description]
-     * @param {[type]} c - [description]
-     * @param {[type]} d - [description]
-     * @param {[type]} e - [description]
-     * @param {[type]} f - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {float} x0 - [description]
+     * @param {float} y0 - [description]
+     * @param {float} x1 - [description]
+     * @param {float} y1 - [description]
+     * @param {float} x2 - [description]
+     * @param {float} y2 - [description]
+     * @param {float} lineWidth - [description]
+     * @param {int} lineColor - [description]
+     * @param {float} lineAlpha - [description]
+     * @param {float} a - [description]
+     * @param {float} b - [description]
+     * @param {float} c - [description]
+     * @param {float} d - [description]
+     * @param {float} e - [description]
+     * @param {float} f - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchStrokeTriangle: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, x0, y0, x1, y1, x2, y2, lineWidth, lineColor, lineAlpha, a, b, c, d, e, f, currentMatrix, roundPixels)
     {
@@ -425,22 +425,22 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchFillPath
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} path - [description]
-     * @param {[type]} fillColor - [description]
-     * @param {[type]} fillAlpha - [description]
-     * @param {[type]} a1 - [description]
-     * @param {[type]} b1 - [description]
-     * @param {[type]} c1 - [description]
-     * @param {[type]} d1 - [description]
-     * @param {[type]} e1 - [description]
-     * @param {[type]} f1 - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {float} path - [description]
+     * @param {int} fillColor - [description]
+     * @param {float} fillAlpha - [description]
+     * @param {float} a1 - [description]
+     * @param {float} b1 - [description]
+     * @param {float} c1 - [description]
+     * @param {float} d1 - [description]
+     * @param {float} e1 - [description]
+     * @param {float} f1 - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchFillPath: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, path, fillColor, fillAlpha, a1, b1, c1, d1, e1, f1, currentMatrix, roundPixels)
     {
@@ -540,24 +540,24 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchStrokePath
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} path - [description]
-     * @param {[type]} lineWidth - [description]
-     * @param {[type]} lineColor - [description]
-     * @param {[type]} lineAlpha - [description]
-     * @param {[type]} a - [description]
-     * @param {[type]} b - [description]
-     * @param {[type]} c - [description]
-     * @param {[type]} d - [description]
-     * @param {[type]} e - [description]
-     * @param {[type]} f - [description]
-     * @param {[type]} isLastPath - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {array} path - [description]
+     * @param {float} lineWidth - [description]
+     * @param {int} lineColor - [description]
+     * @param {float} lineAlpha - [description]
+     * @param {float} a - [description]
+     * @param {float} b - [description]
+     * @param {float} c - [description]
+     * @param {float} d - [description]
+     * @param {float} e - [description]
+     * @param {float} f - [description]
+     * @param {boolean} isLastPath - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchStrokePath: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, path, lineWidth, lineColor, lineAlpha, a, b, c, d, e, f, isLastPath, currentMatrix, roundPixels)
     {
@@ -635,28 +635,28 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchLine
      * @since 3.0.0
      *
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcScaleX - [description]
-     * @param {[type]} srcScaleY - [description]
-     * @param {[type]} srcRotation - [description]
-     * @param {[type]} ax - [description]
-     * @param {[type]} ay - [description]
-     * @param {[type]} bx - [description]
-     * @param {[type]} by - [description]
-     * @param {[type]} aLineWidth - [description]
-     * @param {[type]} bLineWidth - [description]
-     * @param {[type]} aLineColor - [description]
-     * @param {[type]} bLineColor - [description]
-     * @param {[type]} lineAlpha - [description]
-     * @param {[type]} a1 - [description]
-     * @param {[type]} b1 - [description]
-     * @param {[type]} c1 - [description]
-     * @param {[type]} d1 - [description]
-     * @param {[type]} e1 - [description]
-     * @param {[type]} f1 - [description]
-     * @param {[type]} currentMatrix - [description]
-     * @param {[type]} roundPixels - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcScaleX - [description]
+     * @param {float} srcScaleY - [description]
+     * @param {float} srcRotation - [description]
+     * @param {float} ax - [description]
+     * @param {float} ay - [description]
+     * @param {float} bx - [description]
+     * @param {float} by - [description]
+     * @param {float} aLineWidth - [description]
+     * @param {float} bLineWidth - [description]
+     * @param {int} aLineColor - [description]
+     * @param {int} bLineColor - [description]
+     * @param {float} lineAlpha - [description]
+     * @param {float} a1 - [description]
+     * @param {float} b1 - [description]
+     * @param {float} c1 - [description]
+     * @param {float} d1 - [description]
+     * @param {float} e1 - [description]
+     * @param {float} f1 - [description]
+     * @param {Float32Array} currentMatrix - [description]
+     * @param {boolean} roundPixels - [description]
      */
     batchLine: function (srcX, srcY, srcScaleX, srcScaleY, srcRotation, ax, ay, bx, by, aLineWidth, bLineWidth, aLineColor, bLineColor, lineAlpha, a1, b1, c1, d1, e1, f1, currentMatrix, roundPixels) 
     {
@@ -1123,7 +1123,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#drawStaticTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemap - [description]
+     * @param {Phaser.Tilemaps.StaticTilemapLayer} tilemap - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     drawStaticTilemapLayer: function (tilemap, camera)
@@ -1136,7 +1136,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#drawEmitterManager
      * @since 3.0.0
      *
-     * @param {[type]} emitterManager - [description]
+     * @param {Phaser.GameObjects.Particles.ParticleEmittermanager} emitterManager - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     drawEmitterManager: function (emitterManager, camera)
@@ -1149,7 +1149,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#drawBlitter
      * @since 3.0.0
      *
-     * @param {[type]} blitter - [description]
+     * @param {Phaser.GameObjects.Blitter} blitter - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     drawBlitter: function (blitter, camera)
@@ -1162,7 +1162,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchSprite
      * @since 3.0.0
      *
-     * @param {[type]} sprite - [description]
+     * @param {Phaser.GameObjects.Sprite} sprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchSprite: function (sprite, camera)
@@ -1175,7 +1175,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchMesh
      * @since 3.0.0
      *
-     * @param {[type]} mesh - [description]
+     * @param {Phaser.GameObjects.Mesh} mesh - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchMesh: function (mesh, camera)
@@ -1188,7 +1188,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.BitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchBitmapText: function (bitmapText, camera)
@@ -1201,7 +1201,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchDynamicBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.DynamicBitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchDynamicBitmapText: function (bitmapText, camera)
@@ -1214,7 +1214,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchText
      * @since 3.0.0
      *
-     * @param {[type]} text - [description]
+     * @param {Phaser.GameObjects.Text} text - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchText: function (text, camera)
@@ -1227,7 +1227,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchDynamicTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemapLayer - [description]
+     * @param {Phaser.Tilemaps.DynamicTilemapLayer} tilemapLayer - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchDynamicTilemapLayer: function (tilemapLayer, camera)
@@ -1240,7 +1240,7 @@ var FlatTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.FlatTintPipeline#batchTileSprite
      * @since 3.0.0
      *
-     * @param {[type]} tileSprite - [description]
+     * @param {Phaser.GameObjects.TileSprite} tileSprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchTileSprite: function (tileSprite, camera)
diff --git a/src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js b/src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js
index ef3a5cfa2..76905ee45 100644
--- a/src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js
+++ b/src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js
@@ -23,7 +23,7 @@ var LIGHT_COUNT = 10;
  * @since 3.0.0
  *
  * @param {Phaser.Game} game - [description]
- * @param {[type]} gl - [description]
+ * @param {WebGLRenderingContext} gl - [description]
  * @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - [description]
  */
 var ForwardDiffuseLightPipeline = new Class({
@@ -120,10 +120,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#drawStaticTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemap - [description]
+     * @param {Phaser.Tilemaps.StaticTilemapLayer} tilemap - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     drawStaticTilemapLayer: function (tilemap, camera)
     {
@@ -131,12 +130,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.drawStaticTilemapLayer.call(this, tilemap, camera);
+            TextureTintPipeline.prototype.drawStaticTilemapLayer.call(this, tilemap, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. StaticTilemapLayer rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.drawStaticTilemapLayer(tilemap, camera);
+            this.renderer.pipelines.TextureTintPipeline.drawStaticTilemapLayer(tilemap, camera);
         }
     },
 
@@ -146,10 +145,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#drawEmitterManager
      * @since 3.0.0
      *
-     * @param {[type]} emitterManager - [description]
+     * @param {Phaser.GameObjects.Particles.ParticleEmitterManager} emitterManager - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     drawEmitterManager: function (emitterManager, camera)
     {
@@ -157,12 +155,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.drawEmitterManager.call(this, emitterManager, camera);
+            TextureTintPipeline.prototype.drawEmitterManager.call(this, emitterManager, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. EmitterManager rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.drawEmitterManager(emitterManager, camera);
+            this.renderer.pipelines.TextureTintPipeline.drawEmitterManager(emitterManager, camera);
         }
     },
 
@@ -175,7 +173,6 @@ var ForwardDiffuseLightPipeline = new Class({
      * @param {Phaser.GameObjects.Blitter} blitter - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     drawBlitter: function (blitter, camera)
     {
@@ -183,12 +180,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.drawBlitter.call(this, blitter, camera);
+            TextureTintPipeline.prototype.drawBlitter.call(this, blitter, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. Blitter rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.drawBlitter(blitter, camera);
+            this.renderer.pipelines.TextureTintPipeline.drawBlitter(blitter, camera);
         }
     },
 
@@ -201,7 +198,6 @@ var ForwardDiffuseLightPipeline = new Class({
      * @param {Phaser.GameObjects.Sprite} sprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchSprite: function (sprite, camera)
     {
@@ -210,12 +206,12 @@ var ForwardDiffuseLightPipeline = new Class({
         if (normalTexture)
         {
             this.renderer.setTexture2D(normalTexture.glTexture, 1);
-            return TextureTintPipeline.prototype.batchSprite.call(this, sprite, camera);
+            TextureTintPipeline.prototype.batchSprite.call(this, sprite, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. Sprite rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchSprite(sprite, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchSprite(sprite, camera);
         }
     },
 
@@ -228,7 +224,6 @@ var ForwardDiffuseLightPipeline = new Class({
      * @param {Phaser.GameObjects.Mesh} mesh - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchMesh: function (mesh, camera)
     {
@@ -237,12 +232,12 @@ var ForwardDiffuseLightPipeline = new Class({
         if (normalTexture)
         {
             this.renderer.setTexture2D(normalTexture.glTexture, 1);
-            return TextureTintPipeline.prototype.batchMesh.call(this, mesh, camera);
+            TextureTintPipeline.prototype.batchMesh.call(this, mesh, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. Mesh rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchMesh(mesh, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchMesh(mesh, camera);
 
         }
     },
@@ -253,10 +248,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#batchBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.BitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchBitmapText: function (bitmapText, camera)
     {
@@ -264,12 +258,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.batchBitmapText.call(this, bitmapText, camera);
+            TextureTintPipeline.prototype.batchBitmapText.call(this, bitmapText, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. BitmapText rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchBitmapText(bitmapText, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchBitmapText(bitmapText, camera);
         }
     },
 
@@ -279,10 +273,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#batchDynamicBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.DynamicBitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchDynamicBitmapText: function (bitmapText, camera)
     {
@@ -290,12 +283,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.batchDynamicBitmapText.call(this, bitmapText, camera);
+            TextureTintPipeline.prototype.batchDynamicBitmapText.call(this, bitmapText, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. DynamicBitmapText rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchDynamicBitmapText(bitmapText, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchDynamicBitmapText(bitmapText, camera);
         }
     },
 
@@ -305,10 +298,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#batchText
      * @since 3.0.0
      *
-     * @param {[type]} text - [description]
+     * @param {Phaser.GameObjects.Text} text - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchText: function (text, camera)
     {
@@ -316,12 +308,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.batchText.call(this, text, camera);
+            TextureTintPipeline.prototype.batchText.call(this, text, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. Text rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchText(text, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchText(text, camera);
         }
     },
 
@@ -331,10 +323,9 @@ var ForwardDiffuseLightPipeline = new Class({
      * @method Phaser.Renderer.WebGL.ForwardDiffuseLightPipeline#batchDynamicTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemapLayer - [description]
+     * @param {Phaser.Tilemaps.DynamicTilemapLayer} tilemapLayer - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchDynamicTilemapLayer: function (tilemapLayer, camera)
     {
@@ -342,12 +333,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.batchDynamicTilemapLayer.call(this, tilemapLayer, camera);
+            TextureTintPipeline.prototype.batchDynamicTilemapLayer.call(this, tilemapLayer, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. DynamicTilemapLayer rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchDynamicTilemapLayer(tilemapLayer, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchDynamicTilemapLayer(tilemapLayer, camera);
         }
     },
 
@@ -360,7 +351,6 @@ var ForwardDiffuseLightPipeline = new Class({
      * @param {Phaser.GameObjects.TileSprite} tileSprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      *
-     * @return {[type]} [description]
      */
     batchTileSprite: function (tileSprite, camera)
     {
@@ -368,12 +358,12 @@ var ForwardDiffuseLightPipeline = new Class({
 
         if (normalTexture)
         {
-            return TextureTintPipeline.prototype.batchTileSprite.call(this, tileSprite, camera);
+            TextureTintPipeline.prototype.batchTileSprite.call(this, tileSprite, camera);
         }
         else
         {
             console.warn('Normal map texture missing for using Light2D pipeline. TileSprite rendered with default pipeline.');
-            return this.renderer.pipelines.TextureTintPipeline.batchTileSprite(tileSprite, camera);
+            this.renderer.pipelines.TextureTintPipeline.batchTileSprite(tileSprite, camera);
         }
     }
 
diff --git a/src/renderer/webgl/pipelines/TextureTintPipeline.js b/src/renderer/webgl/pipelines/TextureTintPipeline.js
index 53e5b2d89..a7c6f485d 100644
--- a/src/renderer/webgl/pipelines/TextureTintPipeline.js
+++ b/src/renderer/webgl/pipelines/TextureTintPipeline.js
@@ -22,7 +22,7 @@ var WebGLPipeline = require('../WebGLPipeline');
  * @since 3.0.0
  *
  * @param {Phaser.Game} game - [description]
- * @param {[type]} gl - [description]
+ * @param {WebGLRenderingContext} gl - [description]
  * @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - [description]
  * @param {boolean} overrideFragmentShader - [description]
  */
@@ -149,7 +149,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#drawStaticTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemap - [description]
+     * @param {Phaser.Tilemaps.StaticTilemapLayer} tilemap - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     drawStaticTilemapLayer: function (tilemap, camera)
@@ -187,7 +187,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#drawEmitterManager
      * @since 3.0.0
      *
-     * @param {[type]} emitterManager - [description]
+     * @param {Phaser.GameObjects.Particles.ParticleEmitterManager} emitterManager - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     drawEmitterManager: function (emitterManager, camera)
@@ -705,7 +705,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#batchBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.BitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchBitmapText: function (bitmapText, camera)
@@ -928,7 +928,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#batchDynamicBitmapText
      * @since 3.0.0
      *
-     * @param {[type]} bitmapText - [description]
+     * @param {Phaser.GameObjects.DynamicBitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchDynamicBitmapText: function (bitmapText, camera)
@@ -1228,7 +1228,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#batchText
      * @since 3.0.0
      *
-     * @param {[type]} text - [description]
+     * @param {Phaser.GameObjects.Text} text - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchText: function (text, camera)
@@ -1262,7 +1262,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#batchDynamicTilemapLayer
      * @since 3.0.0
      *
-     * @param {[type]} tilemapLayer - [description]
+     * @param {Phaser.Tilemaps.DynamicTilemapLayer} tilemapLayer - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchDynamicTilemapLayer: function (tilemapLayer, camera)
@@ -1354,32 +1354,32 @@ var TextureTintPipeline = new Class({
      * @since 3.0.0
      *
      * @param {Phaser.GameObjects.GameObject} gameObject - [description]
-     * @param {[type]} texture - [description]
-     * @param {[type]} textureWidth - [description]
-     * @param {[type]} textureHeight - [description]
-     * @param {[type]} srcX - [description]
-     * @param {[type]} srcY - [description]
-     * @param {[type]} srcWidth - [description]
-     * @param {[type]} srcHeight - [description]
-     * @param {[type]} scaleX - [description]
-     * @param {[type]} scaleY - [description]
-     * @param {[type]} rotation - [description]
-     * @param {[type]} flipX - [description]
-     * @param {[type]} flipY - [description]
-     * @param {[type]} scrollFactorX - [description]
-     * @param {[type]} scrollFactorY - [description]
-     * @param {[type]} displayOriginX - [description]
-     * @param {[type]} displayOriginY - [description]
-     * @param {[type]} frameX - [description]
-     * @param {[type]} frameY - [description]
-     * @param {[type]} frameWidth - [description]
-     * @param {[type]} frameHeight - [description]
-     * @param {[type]} tintTL - [description]
-     * @param {[type]} tintTR - [description]
-     * @param {[type]} tintBL - [description]
-     * @param {[type]} tintBR - [description]
-     * @param {[type]} uOffset - [description]
-     * @param {[type]} vOffset - [description]
+     * @param {WebGLTexture} texture - [description]
+     * @param {int} textureWidth - [description]
+     * @param {int} textureHeight - [description]
+     * @param {float} srcX - [description]
+     * @param {float} srcY - [description]
+     * @param {float} srcWidth - [description]
+     * @param {float} srcHeight - [description]
+     * @param {float} scaleX - [description]
+     * @param {float} scaleY - [description]
+     * @param {float} rotation - [description]
+     * @param {boolean} flipX - [description]
+     * @param {boolean} flipY - [description]
+     * @param {float} scrollFactorX - [description]
+     * @param {float} scrollFactorY - [description]
+     * @param {float} displayOriginX - [description]
+     * @param {float} displayOriginY - [description]
+     * @param {float} frameX - [description]
+     * @param {float} frameY - [description]
+     * @param {float} frameWidth - [description]
+     * @param {float} frameHeight - [description]
+     * @param {int} tintTL - [description]
+     * @param {int} tintTR - [description]
+     * @param {int} tintBL - [description]
+     * @param {int} tintBR - [description]
+     * @param {float} uOffset - [description]
+     * @param {float} vOffset - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchTexture: function (
@@ -1513,7 +1513,7 @@ var TextureTintPipeline = new Class({
      * @method Phaser.Renderer.WebGL.TextureTintPipeline#batchGraphics
      * @since 3.0.0
      *
-     * @param {[type]} graphics - [description]
+     * @param {Phaser.GameObjects.Graphics} graphics - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
      */
     batchGraphics: function (graphics, camera)