diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png
index 58c5afd372..84969075fb 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-border.png and b/core/assets-raw/sprites/blocks/extra/block-border.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index b3f931cd8d..50b7b59547 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -8577,7 +8577,7 @@ bar-top
   rotate: false
   xy: 915, 683
   size: 27, 36
-  split: 9, 9, 9, 9
+  split: 9, 10, 9, 10
   orig: 27, 36
   offset: 0, 0
   index: -1
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index a81668e8e1..9c895d7187 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 7f58538db3..2c4c420b0e 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -10,7 +10,7 @@ import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
 
 public class Zones implements ContentList{
-    public Zone groundZero, craters, frozenForest, ruinousShores, crags, stainedMountains,
+    public static Zone groundZero, craters, frozenForest, ruinousShores, crags, stainedMountains,
     impact, desolateRift, arcticDesert, dryWastes, nuclearComplex, moltenFault;
 
     @Override
@@ -24,7 +24,7 @@ public class Zones implements ContentList{
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 60;
+                waveSpacing = 60 * 60 * 2; //2 mins
                 spawns = Array.with(
                     new SpawnGroup(UnitTypes.dagger){{
                         unitScaling = 2;
diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java
index 67e95bfb93..35808b1a29 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java
@@ -112,7 +112,7 @@ public class MapRenderer implements Disposable{
         TextureRegion region;
 
         if(bw != 0){
-            region = wall.icon(Icon.full);
+            region = wall.icon(Icon.full) == Core.atlas.find("____") ? Core.atlas.find("clear") : wall.icon(Icon.full);
 
             if(wall.rotate){
                 mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region,
diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java
index 13f9c9d1d0..56347177c3 100644
--- a/core/src/io/anuke/mindustry/game/SpawnGroup.java
+++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java
@@ -47,7 +47,7 @@ public class SpawnGroup{
         }
         float scaling = this.unitScaling;
 
-        return Math.min(unitAmount - 1 + Math.max((int) ((wave / spacing) / scaling), 1), max);
+        return Math.min(unitAmount - 1 + Math.max((int) (((wave - begin) / spacing) / scaling), 1), max);
     }
 
     /**
diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java
index 3487fced36..3b6355c2c8 100644
--- a/core/src/io/anuke/mindustry/game/Waves.java
+++ b/core/src/io/anuke/mindustry/game/Waves.java
@@ -170,7 +170,7 @@ public class Waves{
         return spawns;
     }
 
-    public static void testWaves(int from, int to){
+    public static void testWaves(Array<SpawnGroup> spawns, int from, int to){
         for(int i = from; i <= to; i++){
             System.out.print(i + ": ");
             int total = 0;
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index ca3aadd9c9..1094a1cbf7 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -163,8 +163,13 @@ public class BlockRenderer{
 
             if(req.layer == Layer.shadow){
                 block.drawShadow(req.tile);
-            }else  if(req.layer == Layer.block){
+            }else if(req.layer == Layer.block){
                 block.draw(req.tile);
+                if(block.synthetic() && req.tile.getTeam() != players[0].getTeam()){
+                    Draw.color(req.tile.getTeam().color);
+                    Draw.rect("block-border", req.tile.drawx() - block.size * tilesize/2f + 4, req.tile.drawy() - block.size * tilesize/2f + 4);
+                    Draw.color();
+                }
             }else if(req.layer == block.layer){
                 block.drawLayer(req.tile);
             }else if(req.layer == block.layer2){
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index 12b0bdde6e..32a3fa7ecb 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -220,11 +220,13 @@ public class PlacementFragment extends Fragment{
                                 t.add(new Image(lastDisplay.getDisplayIcon(hoverTile))).size(8 * 4);
                                 t.labelWrap(lastDisplay.getDisplayName(hoverTile)).left().width(190f).padLeft(5);
                             }).growX().left();
-                            topTable.row();
-                            topTable.table(t -> {
-                                t.left().defaults().left();
-                                lastDisplay.display(hoverTile, t);
-                            }).left().growX();
+                            if(hoverTile.getTeam() == players[0].getTeam()){
+                                topTable.row();
+                                topTable.table(t -> {
+                                    t.left().defaults().left();
+                                    lastDisplay.display(hoverTile, t);
+                                }).left().growX();
+                            }
                         }
                     });
                 }).colspan(3).fillX().visible(() -> getSelected() != null || tileDisplayBlock() != null).touchable(Touchable.enabled);