diff --git a/TODO.md b/TODO.md
index 66d6ca0aeb..c80c593414 100644
--- a/TODO.md
+++ b/TODO.md
@@ -8,7 +8,7 @@ _Keep in mind that this is just a basic outline of planned features, and will be
 - [DONE] Make generation frame independent
 - [DONE/MOVED] Investigate issue #5 (enemies stuck in blocks) - looks like it's caused by map loading lag, needs to be fixed with a slightly different physics system
 - [DONE] Faster mech movement, possibly with a "boost" key
-- Balance enemy difficulty
+- [DONE] Balance enemy difficulty
 
 ### 3.x Planned
 - New save system: toggleable autosave, named slots, less clunky save UI
@@ -19,6 +19,8 @@ _Keep in mind that this is just a basic outline of planned features, and will be
 - Underground conduits
 - Minimap
 - More indicators for when the core is damaged and/or under attack
+- Fix bugs with junction not accepting blocks(low FPS)
+- Fix bugs with tunnel merging and/or removing items (low FPS)
 
 
 ### 4.0 Planned
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ddea4614af..021d22f2ca 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.anuke.mindustry"
-    android:versionCode="25"
+    android:versionCode="26"
     android:versionName="3.09b" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
diff --git a/android/build.gradle b/android/build.gradle
index 9987876659..a2073df378 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -33,7 +33,7 @@ android {
     }
     defaultConfig {
         applicationId "io.anuke.mindustry"
-        minSdkVersion 11
+        minSdkVersion 9
         targetSdkVersion 25
 
         jackOptions {
diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java
index 718805af04..42f9a71717 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -25,7 +25,6 @@ public class AndroidLauncher extends AndroidApplication{
 		config.useImmersiveMode = true;
 
 		Mindustry.formatter = new Formatter(){
-			@SuppressLint("SimpleDateFormat")
 			SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm");
 
 			@Override
diff --git a/core/assets/maps/caves.png b/core/assets/maps/caves.png
index 1f8e2f66d8..1fc4865796 100644
Binary files a/core/assets/maps/caves.png and b/core/assets/maps/caves.png differ
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 86769e34ae..b8cafc3abc 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -76,7 +76,12 @@ public class Vars{
 		"Originally an entry in the [orange]GDL[] MM Jam.",
 		"",
 		"Credits:",
-		"- SFX made with [YELLOW]bfxr.com[]",
+		"- SFX made with [YELLOW]bfxr[]",
 		"- Music made by [GREEN]RoccoW[] / found on [lime]FreeMusicArchive.org[]",
+		"",
+		"Special thanks to:",
+		"- MitchellFJN: extensive playtesting and feedback",
+		"- Luxray5474: wiki work, code contributions",
+		"- All the beta testers on itch.io and Google Play"
 	};
 }