===================================================================
--- original.js
+++ change.js
@@ -74,20 +74,20 @@
 			var densityChance = Math.pow(1 + density, 3) / 100;
 			var obstructionTypes = ['largeTree', 'smallTree', 'deadTree', 'rock', 'stump'];
 			var clearanceDist = 150;
 			var clearanceDistSqr = clearanceDist * clearanceDist;
-			var spawnBorder = 10;
-			var cellSize = 100;
+			var spawnBorder = 25;
+			var cellSize = 150;
 			var cols = Math.ceil(width / cellSize);
 			var rows = Math.ceil(height / cellSize);
 			var cellWidth = width / cols;
 			var cellHeight = height / rows;
 			var cellInnerWidth = Math.max(0, cellWidth - 2 * spawnBorder);
 			var cellInnerHeight = Math.max(0, cellHeight - 2 * spawnBorder);
 			var pickup;
 			if (Math.random() <= 0.1) {
-				pickupX = self.x + Math.random() * width - width / 2;
-				pickupY = self.y + Math.random() * height - height / 2;
+				var pickupX = self.x - width / 2 + spawnBorder + Math.random() * (width - spawnBorder * 2);
+				var pickupY = self.y - height / 2 + spawnBorder + Math.random() * (height - spawnBorder * 2);
 				pickups.push(pickup = new Pickup(parent, pickupX, pickupY));
 			}
 			for (i = 0; i < cols; i++) {
 				for (j = 0; j < rows; j++) {
@@ -168,18 +168,39 @@
 	self.hitbox.alpha = 0;
 	self.hitbox.width = graphics.width * 0.8;
 	self.hitbox.height = graphics.width * 0.45;
 });
-var Player = Container.expand(function () {
+var Player = Container.expand(function (parent, x, y) {
 	var self = Container.call(this);
-	self.playerGraphics = self.createAsset('player', 'Player character', 0.575, 1);
-	self.platformGraphics = self.createAsset('platform', 'Platform image', 0.5, 0.5);
-	self.addChild(self.playerGraphics);
-	self.hitbox = self.createAsset('hitbox', 'Player Hitbox', 0.5, 0.5);
-	self.hitbox.width = 25;
-	self.hitbox.height = 25;
-	self.hitbox.alpha = 0;
-	self.addChild(self.hitbox);
+	parent.addChild(self);
+	self.x = x;
+	self.y = y;
+	self.update = update;
+	var speed = 0;
+	var playerGraphics = self.createAsset('player', 'Player character', 0.575, 1);
+	var platformGraphics = self.createAsset('platform', 'Platform image', 0.5, 0.5);
+	var hitbox = self.createAsset('hitbox', 'Player Hitbox', 0.5, 0.5);
+	hitbox.width = 25;
+	hitbox.height = 25;
+	hitbox.alpha = 0;
+	self.hitbox = hitbox;
+	function update(targetPosition) {
+		var dx = targetPosition.x - self.x;
+		var dy = targetPosition.y - self.y;
+		var angle = angleClamp(Math.atan2(dy, dx));
+		var acceleration = (Math.sin(angle) - 0.1) * 2.0;
+		speed = Math.max(0, speed * 0.95 + acceleration);
+		platformGraphics.rotation = angle + Math.PI / 2;
+		var velocityX = Math.cos(angle) * speed;
+		playerGraphics.scale.x = velocityX < 0 ? -1 : 1;
+		return {
+			velocityX: Math.cos(angle) * speed,
+			velocityY: Math.sin(angle) * speed
+		};
+	}
+	function angleClamp(angle) {
+		return angle >= 0 ? angle : angle < -Math.PI / 2 ? Math.PI : 0;
+	}
 });
 var Game = Container.expand(function () {
 	var self = Container.call(this);
 	var stageWidth = 2048;
@@ -189,23 +210,16 @@
 	var background = self.createAsset('background', 'Fullscreen background', 0, 0);
 	var landscapeLookup = {};
 	var landscapeTiles = [];
 	var pickups = [];
-	var direction = {
-		x: 0,
-		y: 0
-	};
 	var speed = 0;
 	background.width = stageWidth;
 	background.height = stageHeight;
 	var targetPosition = {
 		x: 0,
 		y: 0
 	};
-	var player = new Player();
-	self.addChild(player);
-	player.x = stageWidth / 2;
-	player.y = stageHeight / 5;
+	var player = new Player(self, stageWidth / 2, stageHeight / 5);
 	var speedText = new Text2('Speed: 0', {
 		size: 50,
 		fill: "#000000",
 		align: 'right'
@@ -251,16 +265,9 @@
 			updatePosition(obj.event);
 		}
 	});
 	LK.on('tick', function () {
-		var dx = targetPosition.x - player.x;
-		var dy = targetPosition.y - player.y;
-		var angle = angleClamp(Math.atan2(dy, dx));
-		var acceleration = (Math.sin(angle) - 0.1) * 2.0;
-		speed = Math.max(0, speed * 0.95 + acceleration);
-		player.platformGraphics.rotation = angle + Math.PI / 2;
-		var velocityX = Math.cos(angle) * speed;
-		var velocityY = Math.sin(angle) * speed;
+		var {velocityX, velocityY} = player.update(targetPosition);
 		for (var i = landscapeTiles.length - 1; i >= 0; i--) {
 			var landscapeTile = landscapeTiles[i];
 			landscapeTile.x -= velocityX;
 			landscapeTile.y -= velocityY;
@@ -286,14 +293,10 @@
 			}
 		}
 		scoreText.setText(score);
 	});
-	function angleClamp(angle) {
-		return angle >= 0 ? angle : angle < -Math.PI / 2 ? Math.PI : 0;
-	}
 	function updatePosition(event) {
 		var pos = event.getLocalPosition(self);
 		targetPosition.x = pos.x;
 		targetPosition.y = pos.y;
-		player.playerGraphics.scale.x = targetPosition.x < player.x ? -1 : 1;
 	}
 });