===================================================================
--- original.js
+++ change.js
@@ -2220,16 +2220,16 @@
 	return tempNeededUnitList;
 }
 function getUnitNeedsPerWave(waveIndex) {
 	//console.log("getUnitNeedsPerWave...", waveIndex);
-	/* 
+	/*
 		Wave 1 : 1 Quad
 		Wave 2 : 2 Quad
 		Wave 3 : 2 Quad + 1 LightTank
 		Wave 4 : 2 Quad + 2 LightTank
 		Wave 5 : 2 Quad + 2 LightTank + 1 HeavyTank
 		Wave 6+ : 2 Quad + 2 LightTank + 2 HeavyTank
-	*/ 
+	*/
 	var tempNbQuads = Math.min(2, waveIndex);
 	var tempNbLightTanks = Math.min(2, Math.max(0, waveIndex - 2));
 	var tempNbHeavyTanks = Math.min(2, Math.max(0, waveIndex - 4));
 	return {
@@ -2495,12 +2495,8 @@
 	var randomIndex = Math.floor(Math.random() * startingPositions.length);
 	rockIlot1Center = startingPositions[randomIndex];
 	// Remove selected position and choose next for rockIlot2Center
 	startingPositions.splice(randomIndex, 1);
-	/* 
-	viewPort.wCellX = Math.max(0, Math.min(mapXSize - viewPort.cellW, rockIlot1Center.x - Math.floor(viewPort.cellW / 2)));
-	viewPort.wCellY = Math.max(0, Math.min(mapYSize - viewPort.cellH, rockIlot1Center.y - Math.floor(viewPort.cellH / 2)));
-	*/ 
 	rockIlot2Center = startingPositions[Math.floor(Math.random() * startingPositions.length)];
 	//console.log("rockIlot1Center : ", rockIlot1Center);
 	var rockIlot1Radius = 4;
 	for (var x = rockIlot1Center.x - rockIlot1Radius; x <= rockIlot1Center.x + rockIlot1Radius; x++) {
@@ -2698,9 +2694,9 @@
 		var inputPosition = {
 			x: Math.round(-deltaX / tileSize),
 			y: Math.round(-deltaY / tileSize)
 		};
-		var allUnits = (player1.units || []).concat(player2.units || []);
+		var allUnits = player1.units.concat(player2.units);
 		allUnits.forEach(function (unit) {
 			unit.handleDrag(inputPosition);
 			//unit.visible = false;
 		});
@@ -3256,8 +3252,12 @@
 	// Start the game with Player 1 construction yard preselected
 	initGame();
 	LK.setTimeout(function () {
 		gameIsRunning = true;
+		viewPort.wCellX = rockIlot1Center.x;
+		viewPort.wCellY = rockIlot1Center.y;
+		viewPort.wX = rockIlot1Center.x * tileSize - viewPort.wCellX * tileSize;
+		viewPort.wY = rockIlot1Center.y * tileSize - viewPort.wCellY * tileSize;
 		currentSelection = gameMap.cells[rockIlot1Center.x][rockIlot1Center.y].building;
 		selectionMarker.setOnElement(currentSelection);
 		updateActionBoard();
 		updateFogOfWar();