diff --git a/core/lib/ucore.jar b/core/lib/ucore.jar
index ab942371c0..cb536c92dc 100644
Binary files a/core/lib/ucore.jar and b/core/lib/ucore.jar differ
diff --git a/core/src/io/anuke/mindustry/Input.java b/core/src/io/anuke/mindustry/Input.java
index 078f8e03e6..cb0cb9c461 100644
--- a/core/src/io/anuke/mindustry/Input.java
+++ b/core/src/io/anuke/mindustry/Input.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry;
 import static io.anuke.mindustry.Vars.*;
 
 import com.badlogic.gdx.Input.Buttons;
+import com.badlogic.gdx.Input.Keys;
 
 import io.anuke.mindustry.entities.Weapon;
 import io.anuke.mindustry.resource.ItemStack;
@@ -55,6 +56,11 @@ public class Input{
 			Cursors.restoreCursor();
 		}
 		
+		for(int i = 0; i < 9; i ++)
+			if(Inputs.keyUp(Keys.valueOf(""+(i+1))) && getWeapon(i) != null){
+				currentWeapon = getWeapon(i);
+				ui.updateWeapons();
+			}
 		
 		if(Inputs.buttonUp(Buttons.LEFT) && recipe != null && 
 				World.validPlace(World.tilex(), World.tiley(), recipe.result) && !ui.hasMouse()){
@@ -104,4 +110,25 @@ public class Input{
 		}
 
 	}
+	
+	public static int currentWeapons(){
+		int i = 0;
+		
+		for(Weapon w : Weapon.values())
+			if(weapons.get(w))
+				i ++;
+		
+		return i;
+	}
+	
+	public static Weapon getWeapon(int id){
+		int i = 0;
+		
+		for(Weapon w : Weapon.values())
+			if(weapons.get(w))
+				if(i ++ == id)
+					return w;
+		
+		return null;
+	}
 }
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 5e389e64ce..06866180e9 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -19,7 +19,7 @@ public class Vars{
 	public static final float wavespace = 20*60;
 	public static final float enemyspawnspace = 65;
 	public static final float breakduration = 30;
-	public static boolean debug = false;
+	public static boolean debug = true;
 	
 	public static final Vector2 vector = new Vector2();
 	
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index 6827911a6d..42bf54a30a 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -10,7 +10,7 @@ public class DesktopLauncher {
 		Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
 		config.setTitle("Mindustry");
 		config.setMaximized(true);
-		config.useVsync(false);
+		//config.useVsync(false);
 		config.setWindowedMode(800, 600);
 		new Lwjgl3Application(new Mindustry(), config);
 	}