diff --git a/core/assets/sprites/back.png b/core/assets/sprites/back.png
new file mode 100644
index 0000000000..1280a92827
Binary files /dev/null and b/core/assets/sprites/back.png differ
diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java
index c7ce3becbf..926e83e78b 100644
--- a/core/src/io/anuke/mindustry/Control.java
+++ b/core/src/io/anuke/mindustry/Control.java
@@ -95,8 +95,6 @@ public class Control extends RendererModule{
 				Input.doInput();
 			}
 			
-			
-			
 			if(core.block() == ProductionBlocks.core)
 				camera.position.set(player.x, player.y, 0f);
 			else
diff --git a/core/src/io/anuke/mindustry/GameState.java b/core/src/io/anuke/mindustry/GameState.java
index 94ff7b532c..ae215bb403 100644
--- a/core/src/io/anuke/mindustry/GameState.java
+++ b/core/src/io/anuke/mindustry/GameState.java
@@ -58,7 +58,7 @@ public class GameState{
 					
 					Enemy enemy = null;
 					
-					if(wave%5 == 0 /*&& point == 1 */&& pos == 0){
+					if(wave%5 == 0 & pos <= wave/5){
 						enemy = new BossEnemy(point);
 					}else if(wave > 3 && pos < amount/2){
 						enemy = new FastEnemy(point);
@@ -89,7 +89,6 @@ public class GameState{
 			Timers.run(i*2, ()->{
 				Effects.effect("explosion", core.worldx()+Mathf.range(40), core.worldy()+Mathf.range(40));
 			});
-			
 		}
 		Effects.effect("coreexplosion", core.worldx(), core.worldy());
 		
diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java
index 5afffd17d9..c645a20dd0 100644
--- a/core/src/io/anuke/mindustry/UI.java
+++ b/core/src/io/anuke/mindustry/UI.java
@@ -6,8 +6,6 @@ import java.util.function.BooleanSupplier;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.Texture.TextureWrap;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Array;
@@ -15,6 +13,8 @@ import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.resource.*;
 import io.anuke.ucore.core.Draw;
 import io.anuke.ucore.core.Settings;
+import io.anuke.ucore.graphics.Hue;
+import io.anuke.ucore.graphics.Textures;
 import io.anuke.ucore.modules.SceneModule;
 import io.anuke.ucore.scene.Scene;
 import io.anuke.ucore.scene.builders.*;
@@ -29,7 +29,7 @@ public class UI extends SceneModule{
 	SettingsDialog prefs;
 	KeybindDialog keys;
 	Dialog about, menu, restart, tutorial, levels;
-	Texture conveyor = new Texture("sprites/conveyor.png"), conveyort = new Texture("sprites/conveyort.png");
+	//Texture conveyor = new Texture("sprites/conveyor.png"), conveyort = new Texture("sprites/conveyort.png");
 	int selectedMap = 0;
 
 	BooleanSupplier play = () -> {
@@ -46,8 +46,9 @@ public class UI extends SceneModule{
 		
 		Dialog.closePadR = -1;
 		Dialog.closePadT = 4;
-		conveyor.setWrap(TextureWrap.Repeat, TextureWrap.Repeat);
-		conveyort.setWrap(TextureWrap.Repeat, TextureWrap.Repeat);
+		
+		Textures.load("sprites/");
+		Textures.repeatWrap("conveyor", "conveyort", "back");
 	}
 	
 	void drawBackground(){
@@ -57,16 +58,21 @@ public class UI extends SceneModule{
 		int w = gwidth();
 		int h = gheight();
 		
-		Draw.color("gray");
-		
-		batch.draw(conveyor, 0, 0, (int)Timers.time(), 0, w, h);
+		Draw.color(Hue.lightness(0.6f));
 		
 		int tw = w/64+1;//, th = h/64+1;
 		
+		batch.draw(Textures.get("back"), 0, 0, 0, 0, w, h);
+		
 		for(int x = 0; x < tw; x ++){
-			batch.draw(conveyort, x*64, 0, 0, (int)Timers.time(), 32, h);
+			batch.draw(Textures.get("conveyort"), x*64, 0, 0, (int)(Timers.time()*2*(x%2-0.5f)), 32, h);
 		}
 		
+		//for(int y = 0; y < th; y ++){
+		//	batch.draw(Textures.get("conveyor"), 0, y*64, (int)(Timers.time()*2*(y%2-0.5f)), 0, w, 32);
+		//}
+		
+		
 		Draw.color();
 		
 		Draw.tscl(1.5f);
diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
index 7abf10c4e4..f6fe62fd33 100644
--- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
@@ -53,7 +53,7 @@ public class WeaponBlocks{
 	shotgunturret = new Turret("shotgunturret"){
 		{
 			range = 50;
-			reload = 40f;
+			reload = 30f;
 			bullet = BulletType.iron;
 			ammo = Item.iron;
 			health = 70;