diff --git a/marblegame.hl b/marblegame.hl
index 71e5b113..4cf37c62 100644
Binary files a/marblegame.hl and b/marblegame.hl differ
diff --git a/src/Settings.hx b/src/Settings.hx
index 302c1d7c..dc3c207b 100644
--- a/src/Settings.hx
+++ b/src/Settings.hx
@@ -80,7 +80,7 @@ class Settings {
 		invertYAxis: false
 	};
 
-	public static var progression = [24, 24, 52];
+	public static var progression = [0, 0, 0];
 	public static var highscoreName = "";
 
 	public static function applySettings() {
diff --git a/src/Util.hx b/src/Util.hx
index 22bd4637..2c2ad2e5 100644
--- a/src/Util.hx
+++ b/src/Util.hx
@@ -38,8 +38,8 @@ class Util {
 	}
 
 	public static function rotateImage(bitmap:BitmapData, angle:Float) {
-		var curpixels = bitmap.getPixels().clone();
 		bitmap.lock();
+		var curpixels = bitmap.getPixels().clone();
 		if (angle == Math.PI / 2)
 			for (x in 0...curpixels.width) {
 				for (y in 0...curpixels.height) {
@@ -62,8 +62,8 @@ class Util {
 	}
 
 	public static function flipImage(bitmap:BitmapData, hflip:Bool, vflip:Bool) {
-		var curpixels = bitmap.getPixels().clone();
 		bitmap.lock();
+		var curpixels = bitmap.getPixels().clone();
 		if (hflip)
 			for (x in 0...curpixels.width) {
 				for (y in 0...curpixels.height) {
diff --git a/src/collision/CollisionEntity.hx b/src/collision/CollisionEntity.hx
index 8b0d206a..47b97937 100644
--- a/src/collision/CollisionEntity.hx
+++ b/src/collision/CollisionEntity.hx
@@ -92,8 +92,11 @@ class CollisionEntity implements IOctreeObject {
 		var invMatrix = transform.clone();
 		invMatrix.invert();
 		var sphereBounds = new Bounds();
+		var localPos = position.clone();
+		localPos.transform(invMatrix);
 		sphereBounds.addSpherePos(position.x, position.y, position.z, radius * 1.1);
 		sphereBounds.transform(invMatrix);
+		sphereBounds.addSpherePos(localPos.x, localPos.y, localPos.z, radius * 1.1);
 		var surfaces = octree.boundingSearch(sphereBounds);
 
 		var tform = transform.clone();