diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index b282689e8e..6eb086d42c 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -342,7 +342,7 @@ no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
-blocks.outputspeed = Drill Speed: {0}/
+blocks.outputspeed = Drill Speed: {0}/s
 blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Block Info
diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java
index 2305cd6346..adcde8f0f3 100644
--- a/core/src/io/anuke/mindustry/game/SpawnGroup.java
+++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java
@@ -53,7 +53,7 @@ public class SpawnGroup implements Serializable{
         }
         float scaling = this.unitScaling;
 
-        return Math.min(unitAmount - 1 + Math.max((int) (((wave - begin) / spacing) / scaling), 1), max);
+        return Math.min(unitAmount - 1 + Math.max((int) (((wave - begin + 1) / spacing) / scaling), 1), max);
     }
 
     /**
diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
index 5f1617c4a9..4f5f8cbb28 100644
--- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
@@ -9,6 +9,7 @@ import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.Tmp;
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.type.Player;
@@ -36,7 +37,7 @@ public class OverlayRenderer{
 
         if(Core.settings.getBool("indicators")){
             for(Player player : playerGroup.all()){
-                if(player != player && player.getTeam() == player.getTeam()){
+                if(Vars.player != player && Vars.player.getTeam() == player.getTeam()){
                     if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
                     .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index fd1e3cc499..e0761b0201 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -1,13 +1,13 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Edges;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.util.Time;
 
 public class Router extends Block{
     protected float speed = 8f;
@@ -46,7 +46,7 @@ public class Router extends Block{
     public boolean acceptItem(Item item, Tile tile, Tile source){
         SplitterEntity entity = tile.entity();
 
-        return tile.getTeamID() == source.getTeamID() && entity.lastItem == null && entity.items.total() == 0;
+        return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index 2c55e6e9ce..5783914097 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -200,8 +200,8 @@ public class Drill extends Block{
 
         float totalHardness = entity.dominantItems * entity.dominantItem.hardness;
 
-        if(entity.timer.get(timerDump, 15)){
-            tryDump(tile);
+        if(entity.timer.get(timerDump, 5)){
+            tryDump(tile, entity.dominantItem);
         }
 
         entity.drillTime += entity.warmup * entity.delta();