diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)
diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
index 1578016..2d53be3 100644
--- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js
+++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
@@ -19,7 +19,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasGraphicsRenderer
 {
@@ -35,7 +34,6 @@
      * Renders a Graphics object to a canvas.
      *
      * @param {PIXI.Graphics} graphics - the actual graphics object to render
-     * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas
      */
     render(graphics)
     {

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)
diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
index 1578016..2d53be3 100644
--- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js
+++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
@@ -19,7 +19,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasGraphicsRenderer
 {
@@ -35,7 +34,6 @@
      * Renders a Graphics object to a canvas.
      *
      * @param {PIXI.Graphics} graphics - the actual graphics object to render
-     * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas
      */
     render(graphics)
     {
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index e1ce9ce..df3bef2 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -508,7 +508,6 @@
      * Handles a restored webgl context
      *
      * @private
-     * @param {WebGLContextEvent} event - The context restored event.
      */
     handleContextRestored()
     {

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)
diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
index 1578016..2d53be3 100644
--- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js
+++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
@@ -19,7 +19,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasGraphicsRenderer
 {
@@ -35,7 +34,6 @@
      * Renders a Graphics object to a canvas.
      *
      * @param {PIXI.Graphics} graphics - the actual graphics object to render
-     * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas
      */
     render(graphics)
     {
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index e1ce9ce..df3bef2 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -508,7 +508,6 @@
      * Handles a restored webgl context
      *
      * @private
-     * @param {WebGLContextEvent} event - The context restored event.
      */
     handleContextRestored()
     {
diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js
index 18f6311..61245e8 100644
--- a/src/core/renderers/webgl/managers/MaskManager.js
+++ b/src/core/renderers/webgl/managers/MaskManager.js
@@ -3,6 +3,7 @@
 
 /**
  * @class
+ * @extends PIXI.WebGLManager
  * @memberof PIXI
  */
 export default class MaskManager extends WebGLManager

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)
diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
index 1578016..2d53be3 100644
--- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js
+++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
@@ -19,7 +19,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasGraphicsRenderer
 {
@@ -35,7 +34,6 @@
      * Renders a Graphics object to a canvas.
      *
      * @param {PIXI.Graphics} graphics - the actual graphics object to render
-     * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas
      */
     render(graphics)
     {
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index e1ce9ce..df3bef2 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -508,7 +508,6 @@
      * Handles a restored webgl context
      *
      * @private
-     * @param {WebGLContextEvent} event - The context restored event.
      */
     handleContextRestored()
     {
diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js
index 18f6311..61245e8 100644
--- a/src/core/renderers/webgl/managers/MaskManager.js
+++ b/src/core/renderers/webgl/managers/MaskManager.js
@@ -3,6 +3,7 @@
 
 /**
  * @class
+ * @extends PIXI.WebGLManager
  * @memberof PIXI
  */
 export default class MaskManager extends WebGLManager
diff --git a/src/core/renderers/webgl/managers/StencilManager.js b/src/core/renderers/webgl/managers/StencilManager.js
index 5876939..70ff230 100644
--- a/src/core/renderers/webgl/managers/StencilManager.js
+++ b/src/core/renderers/webgl/managers/StencilManager.js
@@ -2,6 +2,7 @@
 
 /**
  * @class
+ * @extends PIXI.WebGLManager
  * @memberof PIXI
  */
 export default class StencilManager extends WebGLManager

diff --git a/src/core/Shader.js b/src/core/Shader.js
index 174df2e..7846567 100644
--- a/src/core/Shader.js
+++ b/src/core/Shader.js
@@ -27,6 +27,7 @@
  * Adds precision string if vertexSrc or fragmentSrc have no mention of it.
  *
  * @class
+ * @extends GLShader
  * @memberof PIXI
  */
 export default class Shader extends GLShader
diff --git a/src/core/display/Container.js b/src/core/display/Container.js
index 89e10a1..fa978cd 100644
--- a/src/core/display/Container.js
+++ b/src/core/display/Container.js
@@ -190,7 +190,7 @@
     /**
      * Removes a child from the container.
      *
-     * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove
+     * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove
      * @return {PIXI.DisplayObject} The first child that was removed.
      */
     removeChild(...childs)
diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js
index 6d7c02a..d5a2448 100644
--- a/src/core/display/DisplayObject.js
+++ b/src/core/display/DisplayObject.js
@@ -207,7 +207,7 @@
     /**
      * Retrieves the local bounds of the displayObject as a rectangle object
      *
-     * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation
+     * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation
      * @return {PIXI.Rectangle} the rectangular bounding area
      */
     getLocalBounds(rect)
diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
index 1578016..2d53be3 100644
--- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js
+++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js
@@ -19,7 +19,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasGraphicsRenderer
 {
@@ -35,7 +34,6 @@
      * Renders a Graphics object to a canvas.
      *
      * @param {PIXI.Graphics} graphics - the actual graphics object to render
-     * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas
      */
     render(graphics)
     {
diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js
index e1ce9ce..df3bef2 100644
--- a/src/core/renderers/webgl/WebGLRenderer.js
+++ b/src/core/renderers/webgl/WebGLRenderer.js
@@ -508,7 +508,6 @@
      * Handles a restored webgl context
      *
      * @private
-     * @param {WebGLContextEvent} event - The context restored event.
      */
     handleContextRestored()
     {
diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js
index 18f6311..61245e8 100644
--- a/src/core/renderers/webgl/managers/MaskManager.js
+++ b/src/core/renderers/webgl/managers/MaskManager.js
@@ -3,6 +3,7 @@
 
 /**
  * @class
+ * @extends PIXI.WebGLManager
  * @memberof PIXI
  */
 export default class MaskManager extends WebGLManager
diff --git a/src/core/renderers/webgl/managers/StencilManager.js b/src/core/renderers/webgl/managers/StencilManager.js
index 5876939..70ff230 100644
--- a/src/core/renderers/webgl/managers/StencilManager.js
+++ b/src/core/renderers/webgl/managers/StencilManager.js
@@ -2,6 +2,7 @@
 
 /**
  * @class
+ * @extends PIXI.WebGLManager
  * @memberof PIXI
  */
 export default class StencilManager extends WebGLManager
diff --git a/src/core/sprites/canvas/CanvasSpriteRenderer.js b/src/core/sprites/canvas/CanvasSpriteRenderer.js
index b51bb02..d2ab0c4 100644
--- a/src/core/sprites/canvas/CanvasSpriteRenderer.js
+++ b/src/core/sprites/canvas/CanvasSpriteRenderer.js
@@ -23,7 +23,6 @@
  * @class
  * @private
  * @memberof PIXI
- * @extends PIXI.ObjectRenderer
  */
 export default class CanvasSpriteRenderer
 {