===================================================================
--- original.js
+++ change.js
@@ -204,9 +204,11 @@
 			directions[5] = [1, 1];
 		}
 		for (var i = 0; i < directions.length; i++) {
 			var dir = directions[i];
-			var newRow = bubbleIndex.row + dir[0];
+			if (bubbleIndex && rows[bubbleIndex.row]) {
+				var newRow = bubbleIndex.row + dir[0];
+			}
 			var newCol = bubbleIndex.col + dir[1];
 			if (newRow >= 0 && newRow < rows.length && newCol >= 0 && newCol < rows[newRow].length) {
 				neighbors.push(rows[newRow][newCol]);
 			}
@@ -321,35 +323,35 @@
 					gameIsStarted = true;
 					var intersectedBubblePos = self.findBubbleIndex(intersectedBubble);
 					var colOffset = rows[intersectedBubblePos.row].length == 13 ? 0 : 1;
 					var offsetPositions = [{
-						x: intersectedBubble.x - bubbleSize / 2,
-						y: intersectedBubble.y - 1.7320508076 * bubbleSize / 2,
+						x: intersectedBubble.targetX - bubbleSize / 2,
+						y: intersectedBubble.targetY - 1.7320508076 * bubbleSize / 2,
 						ro: intersectedBubblePos.row + 1,
 						co: intersectedBubblePos.col - 1 + colOffset
 					}, {
-						x: intersectedBubble.x + bubbleSize / 2,
-						y: intersectedBubble.y - 1.7320508076 * bubbleSize / 2,
+						x: intersectedBubble.targetX + bubbleSize / 2,
+						y: intersectedBubble.targetY - 1.7320508076 * bubbleSize / 2,
 						ro: intersectedBubblePos.row + 1,
 						co: intersectedBubblePos.col + colOffset
 					}, {
-						x: intersectedBubble.x + bubbleSize,
-						y: intersectedBubble.y,
+						x: intersectedBubble.targetX + bubbleSize,
+						y: intersectedBubble.targetY,
 						ro: intersectedBubblePos.row,
 						co: intersectedBubblePos.col + 1
 					}, {
-						x: intersectedBubble.x + bubbleSize / 2,
-						y: intersectedBubble.y + 1.7320508076 * bubbleSize / 2,
+						x: intersectedBubble.targetX + bubbleSize / 2,
+						y: intersectedBubble.targetY + 1.7320508076 * bubbleSize / 2,
 						ro: intersectedBubblePos.row - 1,
 						co: intersectedBubblePos.col + colOffset
 					}, {
-						x: intersectedBubble.x - bubbleSize / 2,
-						y: intersectedBubble.y + 1.7320508076 * bubbleSize / 2,
+						x: intersectedBubble.targetX - bubbleSize / 2,
+						y: intersectedBubble.targetY + 1.7320508076 * bubbleSize / 2,
 						ro: intersectedBubblePos.row - 1,
 						co: intersectedBubblePos.col - 1 + colOffset
 					}, {
-						x: intersectedBubble.x - bubbleSize,
-						y: intersectedBubble.y,
+						x: intersectedBubble.targetX - bubbleSize,
+						y: intersectedBubble.targetY,
 						ro: intersectedBubblePos.row,
 						co: intersectedBubblePos.col - 1
 					}];
 					var closestPosition = 0;
@@ -572,9 +574,9 @@
 /**** 
 * Initialize Game
 ****/ 
 var game = new LK.Game({
-	backgroundColor: 0x010330
+	backgroundColor: 0x0c0d25
 });
 
 /**** 
 * Game Code
@@ -593,13 +595,13 @@
 [ ] Make sure empty rows are removed from the array
 [X] Make sure we GC nodes that drop of screen
 [ ] Make preview line fade out at the end
 [ ] Add preview bubble
-[ ] 
+[ ] Use targetx and y for offset not x,y
 */
 var bubbleSize = 150;
 var gameIsStarted = false;
-var bubbleColors = [0xff2853, 0x44d31f, 0x28f2f0, 0xb22bff, 0x2413ff, 0xff7c11];
+var bubbleColors = [0xff2853, 0x44d31f, 0x3535ff, 0xcb2bff, 0x28f2f0, 0xffc411];
 var barriers = [];
 for (var a = 0; a < 4; a++) {
 	for (var b = 0; b < 3; b++) {
 		var barrier = game.addChild(new Barrier());
@@ -648,9 +650,9 @@
 	refreshHintLine();
 	//	}
 };
 function getMaxTypes() {
-	return Math.max(Math.min(Math.floor((LK.getScore() + 100000) / 50000), bubbleColors.length), 6);
+	return Math.max(Math.min(Math.floor((LK.getScore() + 100000) / 50000), bubbleColors.length), 3);
 }
 function refreshHintLine() {
 	var ox = hintTargetX - launcher.x;
 	var oy = hintTargetY - launcher.y;