diff --git a/Phaser.sublime-workspace b/Phaser.sublime-workspace
index 03737103..2c65ab5a 100644
--- a/Phaser.sublime-workspace
+++ b/Phaser.sublime-workspace
@@ -3,9 +3,77 @@
 	{
 		"selected_items":
 		[
+			[
+				"_cro",
+				"_cropRect"
+			],
+			[
+				"_crop",
+				"_cropUUID"
+			],
+			[
+				"render",
+				"renderTexture"
+			],
+			[
+				"_tex",
+				"_textures"
+			],
+			[
+				"bitma",
+				"bitmapFontText"
+			],
+			[
+				"text",
+				"textureatlas"
+			],
+			[
+				"avai",
+				"availableHeight"
+			],
+			[
+				"av",
+				"availableHeight"
+			],
+			[
+				"avail",
+				"availableWidth"
+			],
+			[
+				"maxp",
+				"maxParticleScale"
+			],
+			[
+				"minp",
+				"minParticleScale"
+			],
+			[
+				"mins",
+				"minParticleScale"
+			],
+			[
+				"_fr",
+				"_frameNames  (variable)"
+			],
+			[
+				"cac",
+				"cacheKey"
+			],
+			[
+				"rnd",
+				"rndFrame"
+			],
 			[
 				"em",
-				"emitY  (variable)"
+				"emitX"
+			],
+			[
+				"add",
+				"addDefaultImage  (function)"
+			],
+			[
+				"crea",
+				"createDefaultTexture"
 			],
 			[
 				"emit",
@@ -131,10 +199,6 @@
 				"chi",
 				"child"
 			],
-			[
-				"add",
-				"addChild"
-			],
 			[
 				"refre",
 				"refreshRate"
@@ -231,10 +295,6 @@
 				"del",
 				"deltaY"
 			],
-			[
-				"av",
-				"average"
-			],
 			[
 				"_o",
 				"_oy"
@@ -454,109 +514,48 @@
 			[
 				"onload",
 				"onLoadUpdateCallback  (variable)"
-			],
-			[
-				"star",
-				"states  (variable)"
-			],
-			[
-				"st",
-				"states  (variable)"
-			],
-			[
-				"State",
-				"StateManager"
-			],
-			[
-				"remem",
-				"rememberMe"
-			],
-			[
-				"swit",
-				"switchState"
-			],
-			[
-				"onpause",
-				"onPausedCallback"
-			],
-			[
-				"inter",
-				"intersectsRaw"
-			],
-			[
-				"cont",
-				"containsRect"
-			],
-			[
-				"prot",
-				"prototype"
-			],
-			[
-				"atl",
-				"atlasURL"
-			],
-			[
-				"addT",
-				"addTextureAtlas"
-			],
-			[
-				"TEX",
-				"TEXTURE_ATLAS_JSON_HASH  (variable)"
-			],
-			[
-				"ad",
-				"appendChild  (function)"
-			],
-			[
-				"fun",
-				"function"
-			],
-			[
-				"prop",
-				"properties"
 			]
 		]
 	},
 	"buffers":
 	[
-		{
-			"file": "src/particles/arcade/Emitter.js",
-			"settings":
-			{
-				"buffer_size": 12517,
-				"line_ending": "Windows",
-				"name": "/**"
-			}
-		},
-		{
-			"file": "examples/particles.php",
-			"settings":
-			{
-				"buffer_size": 1457,
-				"line_ending": "Windows"
-			}
-		},
-		{
-			"file": "src/core/Game.js",
-			"settings":
-			{
-				"buffer_size": 9096,
-				"line_ending": "Windows"
-			}
-		},
 		{
 			"file": "src/gameobjects/Sprite.js",
 			"settings":
 			{
-				"buffer_size": 16356,
+				"buffer_size": 17891,
 				"line_ending": "Windows"
 			}
 		},
 		{
-			"file": "src/physics/arcade/Body.js",
+			"file": "examples/crop3.php",
 			"settings":
 			{
-				"buffer_size": 7207,
+				"buffer_size": 812,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "/D/wamp/www/pixi.js/examples/example 14 - Masking/index.html",
+			"settings":
+			{
+				"buffer_size": 3387,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "src/core/World.js",
+			"settings":
+			{
+				"buffer_size": 5455,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "src/core/Group.js",
+			"settings":
+			{
+				"buffer_size": 19172,
 				"line_ending": "Windows"
 			}
 		}
@@ -589,134 +588,134 @@
 	},
 	"file_history":
 	[
-		"/D/wamp/www/phaser/src/core/Group.js",
-		"/D/wamp/www/phaser/src/particles/Particles.js",
-		"/D/wamp/www/phaser/src/gameobjects/Sprite.js",
-		"/D/wamp/www/phaser/src/physics/arcade/Body.js",
-		"/D/wamp/www/phaser/src/math/RandomDataGenerator.js",
-		"/D/wamp/www/phaser/src/core/World.js",
-		"/D/wamp/www/phaser/src/gameobjects/RenderTexture.js",
-		"/D/wamp/www/phaser/examples/js.php",
-		"/D/wamp/www/phaser/src/particles/arcade/ArcadeParticles.js",
+		"/D/wamp/www/phaser/src/gameobjects/GameObjectFactory.js",
+		"/D/wamp/www/phaser/src/pixi/textures/Texture.js",
+		"/D/wamp/www/phaser/src/pixi/textures/BaseTexture.js",
+		"/D/wamp/www/phaser/src/animation/Animation.js",
 		"/D/wamp/www/phaser/examples/rendertexture.php",
 		"/D/wamp/www/pixi.js/examples/example 11 - RenderTexture/index.html",
-		"/D/wamp/www/phaser/src/gameobjects/Graphics.js",
+		"/D/wamp/www/phaser/src/gameobjects/RenderTexture.js",
 		"/D/wamp/www/phaser/src/pixi/textures/RenderTexture.js",
+		"/D/wamp/www/phaser/src/animation/Frame.js",
+		"/D/wamp/www/phaser/src/loader/Cache.js",
+		"/D/wamp/www/phaser/src/tilemap/Tile.js",
+		"/D/wamp/www/phaser/examples/tilemap.php",
+		"/D/wamp/www/phaser/src/tilemap/Tilemap.js",
+		"/D/wamp/www/phaser/src/tilemap/TilemapLayer.js",
+		"/D/wamp/www/phaser/src/utils/Color.js",
+		"/D/wamp/www/phaser/TS Tests/tilemaps/csv tilemap.ts",
+		"/D/wamp/www/phaser/examples/js.php",
+		"/D/wamp/www/phaser/TS Source/tilemap/Tile.js",
+		"/D/wamp/www/phaser/TS Source/tilemap/TilemapLayer.js",
+		"/D/wamp/www/phaser/TS Source/tilemap/Tilemap.js",
+		"/D/wamp/www/phaser/TS Source/loader/Loader.ts",
+		"/D/wamp/www/phaser/TS Source/loader/Cache.ts",
+		"/D/wamp/www/phaser/examples/sprite_extend.php",
+		"/D/wamp/www/phaser/src/gameobjects/TileSprite.js",
+		"/D/wamp/www/phaser/src/gameobjects/Sprite.js",
+		"/D/wamp/www/phaser/TS Source/gameobjects/ScrollZone.js",
+		"/D/wamp/www/phaser/src/core/World.js",
+		"/D/wamp/www/phaser/TS Source/display/CSS3Filters.js",
+		"/D/wamp/www/phaser/plugins/CSS3Filters.js",
+		"/D/wamp/www/phaser/src/pixi/loaders/BitmapFontLoader.js",
+		"/D/wamp/www/phaser/src/pixi/text/BitmapText.js",
+		"/D/wamp/www/phaser/src/gameobjects/Graphics.js",
+		"/D/wamp/www/phaser/src/gameobjects/BitmapFont.js",
+		"/D/wamp/www/phaser/src/loader/Parser.js",
+		"/D/wamp/www/phaser/src/loader/Loader.js",
+		"/D/wamp/www/pixi.js/examples/example 10 - Text/index.html",
+		"/D/wamp/www/phaser/src/animation/Parser.js",
+		"/D/wamp/www/phaser/examples/assets/fonts/desyrel.xml",
+		"/D/wamp/www/phaser/examples/fullscreen.php",
+		"/D/wamp/www/phaser/src/system/StageScaleMode.js",
+		"/D/wamp/www/phaser/src/core/Game.js",
+		"/D/wamp/www/phaser/src/time/Time.js",
+		"/D/wamp/www/phaser/src/tween/Tween.js",
+		"/D/wamp/www/phaser/src/tween/TweenManager.js",
+		"/D/wamp/www/phaser/src/core/Stage.js",
+		"/D/wamp/www/phaser/src/sound/SoundManager.js",
+		"/D/wamp/www/phaser/src/core/State.js",
+		"/D/wamp/www/phaser/src/core/StateManager.js",
+		"/D/wamp/www/phaser/src/input/Pointer.js",
+		"/D/wamp/www/phaser/src/input/Touch.js",
+		"/D/wamp/www/phaser/src/input/Keyboard.js",
+		"/D/wamp/www/phaser/src/input/InputHandler.js",
+		"/D/wamp/www/phaser/src/input/Input.js",
+		"/D/wamp/www/phaser/src/geom/Circle.js",
+		"/D/wamp/www/phaser/src/geom/Point.js",
+		"/D/wamp/www/phaser/src/geom/Rectangle.js",
+		"/D/wamp/www/phaser/src/core/Signal.js",
+		"/D/wamp/www/phaser/src/core/Plugin.js",
+		"/D/wamp/www/phaser/src/core/PluginManager.js",
+		"/D/wamp/www/phaser/src/core/Group.js",
+		"/D/wamp/www/phaser/src/core/LinkedList.js",
+		"/D/wamp/www/phaser/src/core/Camera.js",
+		"/D/wamp/www/phaser/src/animation/FrameData.js",
+		"/D/wamp/www/phaser/src/gameobjects/Events.js",
+		"/D/wamp/www/phaser/src/animation/AnimationManager.js",
+		"/D/wamp/www/phaser/src/system/Canvas.js",
+		"/D/wamp/www/phaser/examples/input2.php",
+		"/D/wamp/www/phaser/examples/sound1.php",
+		"/D/wamp/www/phaser/src/sound/Sound.js",
+		"/D/wamp/www/phaser/src/utils/Debug.js",
+		"/D/wamp/www/phaser/examples/invaders.php",
+		"/D/wamp/www/phaser/src/input/MSPointer.js",
+		"/D/wamp/www/phaser/src/pixi/renderers/canvas/CanvasRenderer.js",
+		"/D/wamp/www/phaser/src/pixi/renderers/webgl/WebGLRenderer.js",
+		"/D/wamp/www/phaser/src/pixi/InteractionManager.js",
 		"/D/wamp/www/phaser/src/input/Mouse.js",
+		"/D/wamp/www/phaser/examples/stagecolor.php",
+		"/D/wamp/www/phaser/plugins/ColorHarmony.js",
+		"/D/wamp/www/phaser/src/utils/ColorUtils.js",
+		"/D/wamp/www/phaser/TS Source/utils/ColorUtils.js",
+		"/D/wamp/www/phaser/examples/bringToTop3.php",
+		"/D/wamp/www/phaser/examples/bring to top2.php",
+		"/D/wamp/www/phaser/examples/bring to top.php",
+		"/D/wamp/www/phaser/src/math/Math.js",
+		"/D/wamp/www/phaser/src/utils/Utils.js",
+		"/D/wamp/www/phaser/src/particles/arcade/Emitter.js",
+		"/D/wamp/www/phaser/examples/particles.php",
+		"/D/wamp/www/phaser/examples/assets/sprites/pixi_monsters.json",
+		"/D/wamp/www/phaser/src/particles/Particles.js",
+		"/D/wamp/www/phaser/src/physics/arcade/Body.js",
+		"/D/wamp/www/phaser/src/math/RandomDataGenerator.js",
+		"/D/wamp/www/phaser/src/particles/arcade/ArcadeParticles.js",
 		"/D/wamp/www/phaser/src/system/Device.js",
 		"/D/wamp/www/phaser/src/pixi/primitives/Graphics.js",
 		"/D/wamp/www/phaser/examples/graphics.php",
-		"/D/wamp/www/phaser/src/gameobjects/GameObjectFactory.js",
 		"/D/wamp/www/pixi.js/examples/example 13 - Graphics/index.html",
-		"/D/wamp/www/phaser/src/tween/TweenManager.js",
 		"/D/wamp/www/phaser/src/gameobjects/Button.js",
 		"/D/wamp/www/phaser/examples/button1.php",
 		"/D/wamp/www/phaser/examples/outofbounds.php",
 		"/D/wamp/www/phaser/TS Tests/buttons/basic button.ts",
 		"/D/wamp/www/phaser/TS Source/gameobjects/GameObjectFactory.js",
-		"/D/wamp/www/phaser/src/gameobjects/TileSprite.js",
 		"/D/wamp/www/phaser/TS Source/ui/Button.js",
-		"/D/wamp/www/phaser/src/input/InputHandler.js",
 		"/D/wamp/www/phaser/src/Phaser.js",
 		"/D/wamp/www/phaser/build/build.php",
 		"/D/wamp/www/phaser/src/Intro.js",
 		"/D/wamp/www/phaser/build/phaser.js",
-		"/D/wamp/www/phaser/src/input/Input.js",
-		"/D/wamp/www/phaser/src/input/Pointer.js",
 		"/D/wamp/www/phaser/examples/js-physics.php",
-		"/D/wamp/www/phaser/src/utils/Utils.js",
 		"/D/wamp/www/phaser/src/pixi/utils/Utils.js",
 		"/D/wamp/www/phaser/src/pixi/display/Stage.js",
 		"/D/wamp/www/phaser/examples/js_full.php",
 		"/D/wamp/www/phaser/examples/bring top top2.php",
 		"/D/wamp/www/phaser/TS Tests/input/bring to top.ts",
 		"/D/wamp/www/phaser/examples/touch1.php",
-		"/D/wamp/www/phaser/src/utils/Debug.js",
-		"/D/wamp/www/phaser/src/pixi/InteractionManager.js",
-		"/D/wamp/www/phaser/src/gameobjects/Events.js",
 		"/D/wamp/www/phaser/TS Source/utils/DebugUtils.js",
-		"/D/wamp/www/phaser/src/core/LinkedList.js",
 		"/D/wamp/www/phaser/TS Source/gameobjects/Events.js",
 		"/D/wamp/www/phaser/TS Source/input/InputHandler.ts",
 		"/D/wamp/www/phaser/TS Source/input/InputHandler.js",
 		"/D/wamp/www/phaser/examples/linkedlist1.php",
 		"/D/wamp/www/phaser/src/pixi/display/DisplayObjectContainer.js",
 		"/D/wamp/www/phaser/src/pixi/display/DisplayObject.js",
-		"/D/wamp/www/phaser/src/pixi/text/BitmapText.js",
-		"/D/wamp/www/phaser/src/core/Game.js",
 		"/D/wamp/www/phaser/examples/quadtree2.php",
 		"/D/wamp/www/phaser/examples/body3.php",
 		"/D/wamp/www/phaser/examples/body2.php",
 		"/D/wamp/www/phaser/src/math/QuadTree.js",
-		"/D/wamp/www/phaser/examples/invaders.php",
 		"/D/wamp/www/phaser/examples/anchor1.php",
 		"/D/wamp/www/phaser/src/physics/arcade/ArcadePhysics.js",
-		"/D/wamp/www/phaser/src/geom/Rectangle.js",
-		"/D/wamp/www/phaser/src/tween/Tween.js",
 		"/D/wamp/www/phaser/TS Source/core/Group.ts",
-		"/D/wamp/www/phaser/TS Source/core/Group.js",
-		"/D/wamp/www/phaser/examples/consoleBanner3.php",
-		"/D/wamp/www/consoledemo/index.html",
-		"/D/wamp/www/phaser/src/core/Stage.js",
-		"/D/wamp/www/phaser/src/system/Canvas.js",
-		"/D/wamp/www/phaser/examples/consoleBanner2.php",
-		"/D/wamp/www/consoledemo/src/codef_core.js",
-		"/D/wamp/www/consoledemo/src/codef_scrolltext.js",
-		"/D/wamp/www/consoledemo/src/codef_tween.js",
-		"/D/wamp/www/consoledemo/src/codef_3d.js",
-		"/D/wamp/www/consoledemo/src/codef_starfield.js",
-		"/D/JavaScript/codef/tutorials/40_starfield/index.html",
-		"/D/JavaScript/codef/tutorials/41_starfield/index.html",
-		"/D/wamp/www/phaser/TS Source/display/DynamicTexture.js",
-		"/D/wamp/www/phaser/TS Source/utils/ColorUtils.ts",
-		"/D/wamp/www/phaser/src/pixi/renderers/canvas/CanvasRenderer.js",
-		"/D/wamp/www/phaser/TS Source/display/DynamicTexture.ts",
-		"/D/wamp/www/phaser/examples/motion1.php",
-		"/D/wamp/www/phaser/todo/phaser clean up/Collision.js",
-		"/D/wamp/www/phaser/todo/physics/Collision.js",
-		"/D/wamp/www/phaser/src/time/Time.js",
-		"/D/wamp/www/phaser/src/loader/Cache.js",
-		"/D/wamp/www/phaser/src/animation/AnimationManager.js",
-		"/D/wamp/www/phaser/src/animation/Frame.js",
-		"/D/wamp/www/phaser/src/pixi/display/MovieClip.js",
-		"/D/wamp/www/phaser/src/animation/Animation.js",
-		"/D/wamp/www/pixi.js/examples/example 10 - Text/index.html",
-		"/D/wamp/www/physicsRus/test2.html",
-		"/D/wamp/www/phaser/examples/text3.php",
-		"/D/wamp/www/phaser/src/gameobjects/Text.js",
-		"/D/wamp/www/phaser/src/pixi/text/Text.js",
-		"/D/wamp/www/phaser/TS Source/physics/PhysicsManager.js",
-		"/D/wamp/www/phaser/TS Source/physics/AABB.js",
-		"/D/wamp/www/phaser/TS Source/physics/circle/ProjCircleConcave.js",
-		"/D/wamp/www/phaser/todo/oldphysics/arcade/ArcadePhysics.js",
-		"/D/wamp/www/physicsRus/ju.js",
-		"/D/wamp/www/Proton/src/render/PixelRender.js",
-		"/D/wamp/www/phaser/src/physics/advanced/Space.js",
-		"/D/wamp/www/phaser/src/physics/advanced/Body.js",
-		"/D/wamp/www/phaser/src/physics/advanced/shapes/Poly.js",
-		"/D/wamp/www/phaser/src/physics/advanced/shapes/Box.js",
-		"/D/wamp/www/phaser/src/physics/advanced/shapes/Triangle.js",
-		"/D/wamp/www/phaser/src/physics/advanced/ContactSolver.js",
-		"/D/wamp/www/phaser/src/physics/advanced/Util.js",
-		"/D/wamp/www/phaser/src/physics/advanced/base.js",
-		"/D/wamp/www/physicsRus/ph.js",
-		"/D/wamp/www/phaser/src/pixi/textures/Texture.js",
-		"/D/wamp/www/phaser/examples/get_bounds.php",
-		"/D/wamp/www/phaser/src/pixi/display/Sprite.js",
-		"/D/wamp/www/phaser/examples/tilesprite1.php",
-		"/D/wamp/www/phaser/examples/inherit.php",
-		"/D/wamp/www/bbc-wolfblood/wolfblood.js",
-		"/D/wamp/www/phaser/examples/tilesprite2.php",
-		"/D/wamp/www/phaser/src/pixi/extras/TilingSprite.js",
-		"/D/wamp/www/pixi.js/examples/example 9 - Tiling Texture/index.html",
-		"/D/wamp/www/phaser/src/loader/Loader.js",
-		"/D/wamp/www/phaser/TS Tests/audio/play sound 1.ts",
-		"/D/wamp/www/phaser/src/sound/SoundManager.js",
-		"/D/wamp/www/phaser/examples/sound1.php",
-		"/D/wamp/www/phaser/TS Source/gameobjects/GameObjectFactory.ts",
-		"/D/wamp/www/phaser/TS Source/sound/Sound.js",
-		"/D/wamp/www/phaser/src/sound/Sound.js",
-		"/D/wamp/www/phaser/TS Source/sound/Sound.ts"
+		"/D/wamp/www/phaser/TS Source/core/Group.js"
 	],
 	"find":
 	{
@@ -755,6 +754,65 @@
 		"case_sensitive": true,
 		"find_history":
 		[
+			"tempSprite",
+			"texture",
+			"width",
+			"texture.frame",
+			"key",
+			"images",
+			"_sounds",
+			"if(",
+			"Tile.prototype.",
+			"this.game.math",
+			"if(",
+			"for(",
+			"TilemapLayer.prototype.",
+			"for(",
+			"if(",
+			"Tilemap.prototype.",
+			"Phaser.TileSprite",
+			"CSS3Filters",
+			"BitmapFont",
+			"Phaser.Graphics",
+			"Phaser.Text",
+			"Text",
+			"this.texture",
+			"this.ajaxRequest.responseXML",
+			"atlasData",
+			"atlasURL",
+			"atlasData",
+			"atlasURL",
+			"this._tempState",
+			": ",
+			"= ",
+			": ",
+			"this.sprite",
+			": ",
+			"parent",
+			"this._parent",
+			"_parent.events",
+			"console.log",
+			": ",
+			",",
+			"sound",
+			"soundHasUnlocked",
+			"locked",
+			"console.log",
+			"this.game.stage.canvas",
+			"stage.width",
+			"stage.canvas",
+			"Phaser.ColorUtils",
+			"ColorUtils",
+			"ColorUtils.",
+			"sonic",
+			"utils",
+			"carrot",
+			"game.add.child",
+			"float",
+			"Phaser.Sprite.prototype",
+			"i",
+			"active",
+			"key",
 			"star2",
 			"reset",
 			"this.maxSize",
@@ -823,66 +881,7 @@
 			");\n",
 			"checkAlive",
 			"alive",
-			"launch",
-			"font1",
-			"480",
-			"640",
-			"http://codef.santo.fr/codef",
-			"%c ",
-			"s",
-			"line",
-			"node2",
-			"node1",
-			"Prev",
-			"Next",
-			"nextPrev",
-			"var ",
-			"nameNext",
-			"node: ",
-			"nameFirst",
-			"first",
-			"Phaser.Touch_OVERRIDES_MOUSE",
-			"Phaser.Mouse_TOUCH_COMBINE",
-			"Phaser.Mouse_OVERRIDES_TOUCH",
-			":GameObject",
-			":number",
-			"public ",
-			"\n        ",
-			"public ",
-			": number",
-			"public ",
-			"left",
-			"1",
-			"8",
-			"x",
-			"_",
-			"verticalMidpoint",
-			"horizontalMidpoint",
-			"max_levels",
-			"max_objects",
-			"round",
-			"t.nodes",
-			"t.",
-			"Quadtree",
-			"M.",
-			"Quadtree.prototype.",
-			"X",
-			"hitArea",
-			"width",
-			"this",
-			"elasticity",
-			"Collision",
-			"average",
-			"obj2Velocity",
-			"obj1Velocity",
-			"obj2NewVelocity",
-			"obj1NewVelocity",
-			"elasticity",
-			"this.obj2Bounds",
-			"this.obj1Bounds",
-			"obj2Bounds",
-			"obj1Bounds",
-			"Phaser.Physics.Arcade.prototype"
+			"launch"
 		],
 		"highlight": true,
 		"in_selection": false,
@@ -890,6 +889,16 @@
 		"regex": false,
 		"replace_history":
 		[
+			"if (",
+			"for (",
+			"if (",
+			"BitmapText",
+			"xmlData",
+			"xmlURL",
+			"this.sprite",
+			"this.game.canvas",
+			"Phaser.Color",
+			"Color",
 			"",
 			"sprite",
 			"if (",
@@ -991,413 +1000,23 @@
 	"groups":
 	[
 		{
-			"selected": 1,
+			"selected": 3,
 			"sheets":
 			[
 				{
 					"buffer": 0,
-					"file": "src/particles/arcade/Emitter.js",
-					"settings":
-					{
-						"buffer_size": 12517,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								8938,
-								8938
-							]
-						],
-						"settings":
-						{
-							"auto_name": "/**",
-							"codeintel": true,
-							"codeintel_config":
-							{
-								"JavaScript":
-								{
-									"codeintel_max_recursive_dir_depth": 2,
-									"codeintel_scan_files_in_project": false,
-									"javascriptExtraPaths":
-									[
-									]
-								},
-								"PHP":
-								{
-									"codeintel_max_recursive_dir_depth": 5,
-									"codeintel_scan_files_in_project": false,
-									"phpExtraPaths":
-									[
-									]
-								},
-								"Python":
-								{
-									"env":
-									{
-									}
-								}
-							},
-							"codeintel_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_live": true,
-							"codeintel_live_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_max_recursive_dir_depth": 10,
-							"codeintel_scan_exclude_dir":
-							{
-								"JavaScript":
-								[
-									"/build/",
-									"/min/"
-								]
-							},
-							"codeintel_scan_files_in_project": true,
-							"codeintel_selected_catalogs":
-							[
-								"PyWin32",
-								"jQuery",
-								"Rails"
-							],
-							"codeintel_snippets": true,
-							"codeintel_syntax_map":
-							{
-								"Python Django": "Python"
-							},
-							"sublime_auto_complete": true,
-							"syntax": "Packages/JavaScript/JavaScript.tmLanguage"
-						},
-						"translation.x": 0.0,
-						"translation.y": 5852.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 1,
-					"file": "examples/particles.php",
-					"settings":
-					{
-						"buffer_size": 1457,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								353,
-								353
-							]
-						],
-						"settings":
-						{
-							"codeintel": true,
-							"codeintel_config":
-							{
-								"JavaScript":
-								{
-									"codeintel_max_recursive_dir_depth": 2,
-									"codeintel_scan_files_in_project": false,
-									"javascriptExtraPaths":
-									[
-									]
-								},
-								"PHP":
-								{
-									"codeintel_max_recursive_dir_depth": 5,
-									"codeintel_scan_files_in_project": false,
-									"phpExtraPaths":
-									[
-									]
-								},
-								"Python":
-								{
-									"env":
-									{
-									}
-								}
-							},
-							"codeintel_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_live": true,
-							"codeintel_live_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_max_recursive_dir_depth": 10,
-							"codeintel_scan_exclude_dir":
-							{
-								"JavaScript":
-								[
-									"/build/",
-									"/min/"
-								]
-							},
-							"codeintel_scan_files_in_project": true,
-							"codeintel_selected_catalogs":
-							[
-								"PyWin32",
-								"jQuery",
-								"Rails"
-							],
-							"codeintel_snippets": true,
-							"codeintel_syntax_map":
-							{
-								"Python Django": "Python"
-							},
-							"sublime_auto_complete": true,
-							"syntax": "Packages/PHP/PHP.tmLanguage",
-							"tab_size": 4,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0.0,
-						"translation.y": 166.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 2,
-					"file": "src/core/Game.js",
-					"settings":
-					{
-						"buffer_size": 9096,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								5074,
-								5074
-							]
-						],
-						"settings":
-						{
-							"codeintel": true,
-							"codeintel_config":
-							{
-								"JavaScript":
-								{
-									"codeintel_max_recursive_dir_depth": 2,
-									"codeintel_scan_files_in_project": false,
-									"javascriptExtraPaths":
-									[
-									]
-								},
-								"PHP":
-								{
-									"codeintel_max_recursive_dir_depth": 5,
-									"codeintel_scan_files_in_project": false,
-									"phpExtraPaths":
-									[
-									]
-								},
-								"Python":
-								{
-									"env":
-									{
-									}
-								}
-							},
-							"codeintel_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_live": true,
-							"codeintel_live_enabled_languages":
-							[
-								"JavaScript",
-								"Mason",
-								"XBL",
-								"XUL",
-								"RHTML",
-								"SCSS",
-								"Python",
-								"HTML",
-								"Ruby",
-								"Python3",
-								"XML",
-								"Sass",
-								"XSLT",
-								"Django",
-								"HTML5",
-								"Perl",
-								"CSS",
-								"Twig",
-								"Less",
-								"Smarty",
-								"Node.js",
-								"Tcl",
-								"TemplateToolkit",
-								"PHP"
-							],
-							"codeintel_max_recursive_dir_depth": 10,
-							"codeintel_scan_exclude_dir":
-							{
-								"JavaScript":
-								[
-									"/build/",
-									"/min/"
-								]
-							},
-							"codeintel_scan_files_in_project": true,
-							"codeintel_selected_catalogs":
-							[
-								"PyWin32",
-								"jQuery",
-								"Rails"
-							],
-							"codeintel_snippets": true,
-							"codeintel_syntax_map":
-							{
-								"Python Django": "Python"
-							},
-							"sublime_auto_complete": true,
-							"syntax": "Packages/JavaScript/JavaScript.tmLanguage"
-						},
-						"translation.x": 0.0,
-						"translation.y": 3962.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 3,
 					"file": "src/gameobjects/Sprite.js",
 					"settings":
 					{
-						"buffer_size": 16356,
+						"buffer_size": 17891,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								10652,
-								10652
+								16650,
+								16650
 							]
 						],
 						"settings":
@@ -1510,25 +1129,25 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 5193.0,
+						"translation.y": 8910.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 4,
-					"file": "src/physics/arcade/Body.js",
+					"buffer": 1,
+					"file": "examples/crop3.php",
 					"settings":
 					{
-						"buffer_size": 7207,
+						"buffer_size": 812,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								4775,
-								4775
+								695,
+								695
 							]
 						],
 						"settings":
@@ -1636,10 +1255,402 @@
 								"Python Django": "Python"
 							},
 							"sublime_auto_complete": true,
-							"syntax": "Packages/JavaScript/JavaScript.tmLanguage"
+							"syntax": "Packages/PHP/PHP.tmLanguage",
+							"tab_size": 4,
+							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 2666.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 2,
+					"file": "/D/wamp/www/pixi.js/examples/example 14 - Masking/index.html",
+					"settings":
+					{
+						"buffer_size": 3387,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								488,
+								488
+							]
+						],
+						"settings":
+						{
+							"codeintel": true,
+							"codeintel_config":
+							{
+								"JavaScript":
+								{
+									"codeintel_max_recursive_dir_depth": 2,
+									"codeintel_scan_files_in_project": false,
+									"javascriptExtraPaths":
+									[
+									]
+								},
+								"PHP":
+								{
+									"codeintel_max_recursive_dir_depth": 5,
+									"codeintel_scan_files_in_project": false,
+									"phpExtraPaths":
+									[
+									]
+								},
+								"Python":
+								{
+									"env":
+									{
+									}
+								}
+							},
+							"codeintel_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_live": true,
+							"codeintel_live_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_max_recursive_dir_depth": 10,
+							"codeintel_scan_exclude_dir":
+							{
+								"JavaScript":
+								[
+									"/build/",
+									"/min/"
+								]
+							},
+							"codeintel_scan_files_in_project": true,
+							"codeintel_selected_catalogs":
+							[
+								"PyWin32",
+								"jQuery",
+								"Rails"
+							],
+							"codeintel_snippets": true,
+							"codeintel_syntax_map":
+							{
+								"Python Django": "Python"
+							},
+							"sublime_auto_complete": true,
+							"syntax": "Packages/HTML/HTML.tmLanguage",
+							"translate_tabs_to_spaces": false
+						},
+						"translation.x": 0.0,
+						"translation.y": 1424.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 3,
+					"file": "src/core/World.js",
+					"settings":
+					{
+						"buffer_size": 5455,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								0,
+								0
+							]
+						],
+						"settings":
+						{
+							"codeintel": true,
+							"codeintel_config":
+							{
+								"JavaScript":
+								{
+									"codeintel_max_recursive_dir_depth": 2,
+									"codeintel_scan_files_in_project": false,
+									"javascriptExtraPaths":
+									[
+									]
+								},
+								"PHP":
+								{
+									"codeintel_max_recursive_dir_depth": 5,
+									"codeintel_scan_files_in_project": false,
+									"phpExtraPaths":
+									[
+									]
+								},
+								"Python":
+								{
+									"env":
+									{
+									}
+								}
+							},
+							"codeintel_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_live": true,
+							"codeintel_live_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_max_recursive_dir_depth": 10,
+							"codeintel_scan_exclude_dir":
+							{
+								"JavaScript":
+								[
+									"/build/",
+									"/min/"
+								]
+							},
+							"codeintel_scan_files_in_project": true,
+							"codeintel_selected_catalogs":
+							[
+								"PyWin32",
+								"jQuery",
+								"Rails"
+							],
+							"codeintel_snippets": true,
+							"codeintel_syntax_map":
+							{
+								"Python Django": "Python"
+							},
+							"sublime_auto_complete": true,
+							"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
+							"translate_tabs_to_spaces": false
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 4,
+					"file": "src/core/Group.js",
+					"settings":
+					{
+						"buffer_size": 19172,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								0,
+								0
+							]
+						],
+						"settings":
+						{
+							"codeintel": true,
+							"codeintel_config":
+							{
+								"JavaScript":
+								{
+									"codeintel_max_recursive_dir_depth": 2,
+									"codeintel_scan_files_in_project": false,
+									"javascriptExtraPaths":
+									[
+									]
+								},
+								"PHP":
+								{
+									"codeintel_max_recursive_dir_depth": 5,
+									"codeintel_scan_files_in_project": false,
+									"phpExtraPaths":
+									[
+									]
+								},
+								"Python":
+								{
+									"env":
+									{
+									}
+								}
+							},
+							"codeintel_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_live": true,
+							"codeintel_live_enabled_languages":
+							[
+								"JavaScript",
+								"Mason",
+								"XBL",
+								"XUL",
+								"RHTML",
+								"SCSS",
+								"Python",
+								"HTML",
+								"Ruby",
+								"Python3",
+								"XML",
+								"Sass",
+								"XSLT",
+								"Django",
+								"HTML5",
+								"Perl",
+								"CSS",
+								"Twig",
+								"Less",
+								"Smarty",
+								"Node.js",
+								"Tcl",
+								"TemplateToolkit",
+								"PHP"
+							],
+							"codeintel_max_recursive_dir_depth": 10,
+							"codeintel_scan_exclude_dir":
+							{
+								"JavaScript":
+								[
+									"/build/",
+									"/min/"
+								]
+							},
+							"codeintel_scan_files_in_project": true,
+							"codeintel_selected_catalogs":
+							[
+								"PyWin32",
+								"jQuery",
+								"Rails"
+							],
+							"codeintel_snippets": true,
+							"codeintel_syntax_map":
+							{
+								"Python Django": "Python"
+							},
+							"sublime_auto_complete": true,
+							"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
+							"translate_tabs_to_spaces": false
+						},
+						"translation.x": 0.0,
+						"translation.y": 13739.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
diff --git a/examples/assets/audio/bodenstaendig_2000_in_rock_4bit.ogg b/examples/assets/audio/bodenstaendig_2000_in_rock_4bit.ogg
new file mode 100644
index 00000000..6b02e8cd
Binary files /dev/null and b/examples/assets/audio/bodenstaendig_2000_in_rock_4bit.ogg differ
diff --git a/examples/assets/audio/oedipus_wizball_highscore.xmp b/examples/assets/audio/oedipus_wizball_highscore.xmp
deleted file mode 100644
index cc00ef74..00000000
--- a/examples/assets/audio/oedipus_wizball_highscore.xmp
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        ">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/">
-         <xmpDM:Tracks>
-            <rdf:Bag>
-               <rdf:li rdf:parseType="Resource">
-                  <xmpDM:trackName>CuePoint Markers</xmpDM:trackName>
-                  <xmpDM:trackType>Cue</xmpDM:trackType>
-                  <xmpDM:frameRate>f44100</xmpDM:frameRate>
-               </rdf:li>
-               <rdf:li rdf:parseType="Resource">
-                  <xmpDM:trackName>Subclip Markers</xmpDM:trackName>
-                  <xmpDM:trackType>InOut</xmpDM:trackType>
-                  <xmpDM:frameRate>f44100</xmpDM:frameRate>
-               </rdf:li>
-            </rdf:Bag>
-         </xmpDM:Tracks>
-      </rdf:Description>
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:MetadataDate>2013-07-16T02:39:59+01:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2013-07-16T02:39:59+01:00</xmp:ModifyDate>
-      </rdf:Description>
-      <rdf:Description rdf:about=""
-            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
-            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
-            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#">
-         <xmpMM:InstanceID>xmp.iid:CF0377343CEDE211B46AA47009D9EF1D</xmpMM:InstanceID>
-         <xmpMM:DocumentID>xmp.did:CF0377343CEDE211B46AA47009D9EF1D</xmpMM:DocumentID>
-         <xmpMM:OriginalDocumentID>xmp.did:CE0377343CEDE211B46AA47009D9EF1D</xmpMM:OriginalDocumentID>
-         <xmpMM:History>
-            <rdf:Seq>
-               <rdf:li rdf:parseType="Resource">
-                  <stEvt:action>saved</stEvt:action>
-                  <stEvt:instanceID>xmp.iid:CE0377343CEDE211B46AA47009D9EF1D</stEvt:instanceID>
-                  <stEvt:when>2013-07-16T02:39:59+01:00</stEvt:when>
-                  <stEvt:softwareAgent>Adobe Audition CS6 (Windows)</stEvt:softwareAgent>
-                  <stEvt:changed>/metadata</stEvt:changed>
-               </rdf:li>
-               <rdf:li rdf:parseType="Resource">
-                  <stEvt:action>saved</stEvt:action>
-                  <stEvt:instanceID>xmp.iid:CF0377343CEDE211B46AA47009D9EF1D</stEvt:instanceID>
-                  <stEvt:when>2013-07-16T02:39:59+01:00</stEvt:when>
-                  <stEvt:softwareAgent>Adobe Audition CS6 (Windows)</stEvt:softwareAgent>
-                  <stEvt:changed>/</stEvt:changed>
-               </rdf:li>
-            </rdf:Seq>
-         </xmpMM:History>
-         <xmpMM:DerivedFrom rdf:parseType="Resource">
-            <stRef:instanceID>xmp.iid:CE0377343CEDE211B46AA47009D9EF1D</stRef:instanceID>
-            <stRef:documentID>xmp.did:CE0377343CEDE211B46AA47009D9EF1D</stRef:documentID>
-            <stRef:originalDocumentID>xmp.did:CE0377343CEDE211B46AA47009D9EF1D</stRef:originalDocumentID>
-         </xmpMM:DerivedFrom>
-      </rdf:Description>
-      <rdf:Description rdf:about=""
-            xmlns:dc="http://purl.org/dc/elements/1.1/">
-         <dc:format>audio/ogg; codec="vorbis"</dc:format>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
-<?xpacket end="w"?>
\ No newline at end of file
diff --git a/examples/sound1.php b/examples/sound1.php
index 4e8a60d6..c71b0a99 100644
--- a/examples/sound1.php
+++ b/examples/sound1.php
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+	<meta charset="UTF-8" />
 	<title>phaser.js - a new beginning</title>
 	<?php
 		require('js.php');
@@ -15,9 +16,11 @@
 	var game = new Phaser.Game(800, 600, Phaser.CANVAS, '', { preload: preload, create: create, update: update, render: render });
 
 	function preload() {
+
 		game.load.image('disk', 'assets/sprites/ra_dont_crack_under_pressure.png');
-        //game.load.audio('wizball', ['assets/mp3/oedipus_wizball_highscore.ogg', 'assets/mp3/oedipus_wizball_highscore.mp3']);
-        game.load.audio('boden', ['assets/audio/bodenstaendig_2000_in_rock_4bit.mp3']);
+
+        //	Firefox doesn't support mp3 files, so use ogg
+        game.load.audio('boden', ['assets/audio/bodenstaendig_2000_in_rock_4bit.mp3', 'assets/audio/bodenstaendig_2000_in_rock_4bit.ogg']);
 
 	}
 
@@ -34,6 +37,21 @@
 		s = game.add.sprite(game.world.centerX, game.world.centerY, 'disk');
 		s.anchor.setTo(0.5, 0.5);
 
+		game.input.onDown.add(changeVolume, this);
+
+	}
+
+	function changeVolume(pointer) {
+
+		if (pointer.y < 300)
+		{
+			music.volume += 0.1;
+		}
+		else
+		{
+			music.volume -= 0.1;
+		}
+
 	}
 
 	function update() {
diff --git a/src/core/Game.js b/src/core/Game.js
index 7309284c..eeb02937 100644
--- a/src/core/Game.js
+++ b/src/core/Game.js
@@ -76,7 +76,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
 	* The Pixi Renderer
 	* @type {number}
 	*/
-	this.renderType = renderer;
+	this.renderer = null;
 
     /**
      * The StateManager.
@@ -94,7 +94,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
 	* The Renderer this Phaser.Game will use. Either Phaser.RENDERER_AUTO, Phaser.RENDERER_CANVAS or Phaser.RENDERER_WEBGL
 	* @type {number}
 	*/
-	this.renderType = 0;
+	this.renderType = renderer;
 
 	/**
 	* Whether load complete loading or not.
@@ -334,7 +334,7 @@ Phaser.Game.prototype = {
 
 	setUpRenderer: function () {
 
-		if (this.renderType == Phaser.CANVAS || (this.renderType == Phaser.AUTO && this.device.webGL == false))
+		if (this.renderType === Phaser.CANVAS || (this.renderType === Phaser.AUTO && this.device.webGL == false))
 		{
 			if (this.device.canvas)
 			{
diff --git a/src/loader/Cache.js b/src/loader/Cache.js
index 8c62d929..89c1f70d 100644
--- a/src/loader/Cache.js
+++ b/src/loader/Cache.js
@@ -49,6 +49,8 @@ Phaser.Cache = function (game) {
 
     this.addDefaultImage();
 
+    this.onSoundUnlock = new Phaser.Signal;
+
 };
 
 Phaser.Cache.prototype = {
diff --git a/src/loader/Loader.js b/src/loader/Loader.js
index 68de2c11..e5b1c2b6 100644
--- a/src/loader/Loader.js
+++ b/src/loader/Loader.js
@@ -471,7 +471,7 @@ Phaser.Loader.prototype = {
 					{
 						if (this.game.sound.touchLocked)
 						{
-							//  If audio is locked we can't do this yet, so need to queue this load request somehow. Bum.
+							//  If audio is locked we can't do this yet, so need to queue this load request. Bum.
 							file.data = new Audio();
 							file.data.name = file.key;
 							file.data.preload = 'auto';
@@ -492,6 +492,10 @@ Phaser.Loader.prototype = {
 						}
 					}
 				}
+				else
+				{
+					this.fileError(file.key);
+				}
 
 				break;
 
diff --git a/src/sound/Sound.js b/src/sound/Sound.js
index b37d9b01..b1db2929 100644
--- a/src/sound/Sound.js
+++ b/src/sound/Sound.js
@@ -56,10 +56,15 @@ Phaser.Sound = function (game, key, volume, loop) {
     }
     else
     {
-        if (this.game.cache.getSound(key) && this.game.cache.getSound(key).locked == false)
+        if (this.game.cache.getSound(key) && this.game.cache.isSoundReady(key))
         {
             this._sound = this.game.cache.getSoundData(key);
-            this.totalDuration = this._sound.duration;
+            this.totalDuration = 0;
+
+            if (this._sound.duration)
+            {
+                this.totalDuration = this._sound.duration;
+            }
         }
         else
         {
@@ -86,7 +91,7 @@ Phaser.Sound.prototype = {
         {
             this._sound = this.game.cache.getSoundData(this.key);
             this.totalDuration = this._sound.duration;
-            // console.log('sound has unlocked' + this._sound);
+            console.log('sound has unlocked' + this._sound);
 	    }
 
 	},
@@ -298,24 +303,28 @@ Phaser.Sound.prototype = {
         }
         else
         {
-            //console.log('Sound play Audio');
+            // console.log('Sound play Audio');
             if (this.game.cache.getSound(this.key) && this.game.cache.getSound(this.key).locked)
             {
-                //console.log('tried playing locked sound, pending set, reload started');
+                // console.log('tried playing locked sound, pending set, reload started');
                 this.game.cache.reloadSound(this.key);
                 this.pendingPlayback = true;
             }
             else
             {
-                //console.log('sound not locked, state?', this._sound.readyState);
+                // console.log('sound not locked, state?', this._sound.readyState);
                 if (this._sound && this._sound.readyState == 4)
                 {
+                    this._sound.play();
+                    //  This doesn't become available until you call play(), wonderful ...
+                    this.totalDuration = this._sound.duration;
+
                     if (this.duration == 0)
                     {
                         this.duration = this.totalDuration * 1000;
                     }
 
-                    //console.log('playing', this._sound);
+                    // console.log('playing', this._sound);
                     this._sound.currentTime = this.position;
                     this._sound.muted = this._muted;
                     
@@ -328,7 +337,6 @@ Phaser.Sound.prototype = {
                         this._sound.volume = this._volume;
                     }
 
-                    this._sound.play();
                     this.isPlaying = true;
                     this.startTime = this.game.time.now;
                     this.currentTime = 0;
@@ -507,15 +515,19 @@ Object.defineProperty(Phaser.Sound.prototype, "volume", {
 
     set: function (value) {
 
-        this._volume = value;
-        
         if (this.usingWebAudio)
         {
+            this._volume = value;
             this.gainNode.gain.value = value;
         }
-        else if(this.usingAudioTag && this._sound)
+        else if (this.usingAudioTag && this._sound)
         {
-            this._sound.volume = value;
+            //  Causes an Index size error in Firefox if you don't clamp the value
+            if (value >= 0 && value <= 1)
+            {
+                this._volume = value;
+                this._sound.volume = value;
+            }
         }
     },
 
diff --git a/src/system/Canvas.js b/src/system/Canvas.js
index 3fce6ffd..f24fbdaa 100644
--- a/src/system/Canvas.js
+++ b/src/system/Canvas.js
@@ -105,9 +105,16 @@ Phaser.Canvas = {
         parent = parent || '';
         overflowHidden = overflowHidden || true;
 
-        if ((parent !== '' || parent !== null) && document.getElementById(parent))
+        if (parent !== '')
         {
-            document.getElementById(parent).appendChild(canvas);
+            if (document.getElementById(parent))
+            {
+                document.getElementById(parent).appendChild(canvas);
+            }
+            else
+            {
+                document.body.appendChild(canvas);
+            }
 
             if (overflowHidden)
             {