===================================================================
--- original.js
+++ change.js
@@ -235,25 +235,33 @@
 		anchorY: 0.75
 	});
 	;
 	self.update = update;
+	self.currentAngle = 0;
 	;
 	function update() {
-		var currentAngle = Math.atan2(self.y, self.x);
-		var angleDifference = targetAngle - currentAngle;
-		angleDifference = mod(angleDifference + Math.PI, MATH_2_PI) - Math.PI;
-		if (angleDifference < -MATH_APPROX_ZERO || angleDifference > MATH_APPROX_ZERO) {
+		self.currentAngle = Math.atan2(self.y, self.x);
+		var angleDifference = mod(targetAngle - currentAngle + Math.PI, MATH_2_PI) - Math.PI;
+		if (approxZero(angleDifference)) {
+			if (taskLaunch) {
+				self.destroy();
+				player = undefined;
+				LK.setTimeout(function () {
+					ship.launch(1);
+				}, PLAYER_SPAWN_DELAY);
+			} else if (taskPlanter) {} else {
+				performAction(currentAngle);
+				actionCountdown = PLAYER_ACTION_INTERVAL;
+			}
+		} else if (--actionCountdown <= 0) {
 			var direction = angleDifference / Math.abs(angleDifference);
 			var angleStep = PLAYER_SPEED / planet.radius;
 			var newAngle = currentAngle + direction * Math.min(Math.abs(angleDifference), angleStep);
 			self.x = Math.cos(newAngle) * planet.radius;
 			self.y = Math.sin(newAngle) * planet.radius;
 			playerGraphics.scale.x = direction < 0 ? -1 : 1;
 			playerGraphics.rotation = newAngle + MATH_HALF_PI;
 			actionCountdown = 0; // Perform action immediately after stopping
-		} else if (--actionCountdown <= 0) {
-			actionCountdown = PLAYER_ACTION_INTERVAL;
-			performAction(currentAngle);
 		}
 	}
 	function performAction(angle) {
 		var count = planet.nodes.length;
@@ -305,9 +313,9 @@
 						rotation: ship.rotation,
 						x: ship.x,
 						y: ship.y
 					}));
-				}, 500);
+				}, PLAYER_SPAWN_DELAY);
 			}
 		} else if (self.direction > 0) {
 			counter++;
 			var speed = Math.pow(ROCKET_SPEED_BASE, counter / ROCKET_SPEED_DIV - ROCKET_SPEED_DELAY);
@@ -327,12 +335,8 @@
 	}
 	function launch(direction) {
 		if (!self.direction) {
 			self.direction = direction;
-			if (direction > 0) {
-				player.destroy();
-				player = undefined;
-			}
 		}
 	}
 });
 var FlameParticle = ConfigContainer.expand(function (config) {
@@ -826,10 +830,10 @@
 	if (self.unlocked) {
 		unlock();
 	}
 });
-var NavigationInterface = Container.expand(function (x, y) {
-	var self = Container.call(this);
+var NavigationInterface = ConfigContainer.expand(function (config) {
+	var self = ConfigContainer.call(this);
 	var buttons = {};
 	var baseOffset = -NAVIGATION.length / 2 + 0.5;
 	var firstPlanet = NAVIGATION[0];
 	for (var i = 0; i < NAVIGATION.length; i++) {
@@ -840,10 +844,9 @@
 			y: 0
 		}));
 	}
 	;
-	self.x = x;
-	self.y = y;
+	self.setDestination = setDestination;
 	;
 	function buttonCallback(planet) {
 		var button = buttons[planet];
 		if (button.unlocked) {
@@ -852,15 +855,18 @@
 			moneyDisplay.setText(money -= button.cost);
 			button.unlock();
 		}
 	}
-	self.setDestination = setDestination;
-	;
 	function setDestination(planet) {
-		if (destinationPlanet !== planet && ship.direction === 0) {
-			destinationPlanet = planet;
+		if (player) {
 			buttons[planet].addChild(crosshair);
-			ship.launch(1);
+			destinationPlanet = planet;
+			if (destinationPlanet !== planet) {
+				taskLaunch = true;
+				targetAngle = 0;
+			} else {
+				taskLaunch = false;
+			}
 		}
 	}
 	;
 	buttonCallback(firstPlanet);
@@ -1524,8 +1530,9 @@
 var EXPLOSION_FRAMES = 15; // Number of frames for the explosion animation to last
 ;
 // Player settings
 var PLAYER_SPEED = 5;
+var PLAYER_SPAWN_DELAY = 500;
 var PLAYER_ACTION_INTERVAL = Math.floor(GAME_TICKS / 4);
 var PLAYER_ACTION_DIST = 80;
 var PLAYER_ACTION_SQRDIST = PLAYER_ACTION_DIST * PLAYER_ACTION_DIST;
 var PLAYER_BUFFER_DIST = 400;
@@ -1729,8 +1736,10 @@
 };
 var skipRetarget = false;
 var retargetAngle;
 var targetAngle = PLAYER_START_ANGLE;
+var taskLaunch = false;
+var taskPlanter = false;
 var currentPlanet = NAVIGATION[0];
 var destinationPlanet = NAVIGATION[0];
 var background = game.addChild(new Background());
 var midground = game.addChild(new Container());
@@ -1753,9 +1762,12 @@
 	anchorX: 0,
 	anchorY: .5
 }));
 var crosshair = new Crosshair();
-var navigation = LK.gui.bottom.addChild(new NavigationInterface(0, -100));
+var navigation = LK.gui.bottom.addChild(new NavigationInterface({
+	x: 0,
+	y: -100
+}));
 planetMap[planet.name] = planet;
 ;
 //==============================================================================
 // Gameplay events
@@ -1795,8 +1807,13 @@
 		var dy = clickPosition.y - planet.y;
 		var sqrDistance = dx * dx + dy * dy;
 		var range = planet.radius + PLAYER_BUFFER_DIST;
 		if (sqrDistance <= range * range) {
+			if (taskLaunch) {
+				taskLaunch = false;
+				navigation.setDestination(currentPlanet);
+			}
+			taskPlanter = false;
 			retargetAngle = Math.atan2(dy, dx) - planet.rotation;
 		}
 	}
 });
@@ -1888,17 +1905,21 @@
 	background.refresh();
 	inventory.refreshAllowed();
 }
 ;
+function saveStats() {
+	for (var key in stats) {
+		winningStats[key] = stats[key];
+	}
+}
+;
 function mod(x, base) {
 	return (x % base + base) % base;
 }
 ;
 function randomInt(min, max) {
 	return Math.floor(min + Math.random() * (max - min));
 }
 ;
-function saveStats() {
-	for (var key in stats) {
-		winningStats[key] = stats[key];
-	}
+function approxZero(value) {
+	return value > -MATH_APPROX_ZERO && value < MATH_APPROX_ZERO;
 }
\ No newline at end of file