diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index 90342de2..2f3138ec 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -83,7 +83,7 @@ public class Permanent implements Listener {
 
     @EventHandler
     public void onTpGM3(PlayerTeleportEvent e) {
-        if (e.getCause() == PlayerTeleportEvent.TeleportCause.SPECTATE) {
+        if (ArenaMode.AntiTest.contains(Config.mode) && e.getCause() == PlayerTeleportEvent.TeleportCause.SPECTATE) {
             e.setCancelled(true);
             FightSystem.getMessage().sendPrefixless("NO_TELEPORT", e.getPlayer(), ChatMessageType.ACTION_BAR);
             e.getPlayer().kickPlayer(null);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index ee0c1af1..825c5eb6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -25,6 +25,7 @@ import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RPlayer;
+import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.countdown.Countdown;
@@ -243,6 +244,9 @@ public class PacketProcessor implements Listener {
             SteamwarUser user = SteamwarUser.get(userId);
             addREntity(entityId, new RPlayer(entityServer, user.getUUID(), user.getUserName(), Config.SpecSpawn));
             team.addEntry(user.getUserName());
+
+            if(ArenaMode.Test.contains(Config.mode))
+                entities.get(entityId).setGlowing(true);
         });
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
index bb905c86..531b133e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
@@ -24,7 +24,6 @@ import de.steamwar.entity.REntity;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.FightTeam;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.bukkit.Location;
@@ -52,7 +51,7 @@ public class Hull {
 
     private final BitSet occluding;
     private final BitSet visibility;
-    private final Int2IntOpenHashMap visibilityDirections = new Int2IntOpenHashMap(); // Contains the visible directions of each occluding visible block
+    private final HashMap<IntVector, BitSet> visibilityDirections = new HashMap<>(); // Contains the visible directions of each occluding visible block
     private final Set<IntVector> uncoveredSurface = new HashSet<>();
 
     private final HashSet<Player> players = new HashSet<>();
@@ -68,13 +67,14 @@ public class Hull {
 
         directions = IntStream.range(0, 27)
                 .mapToObj(v -> new IntVector(v%3 -1, (v/3)%3 -1, v/9 -1))
-                .filter(v -> v.sqLength() > 0)
-                .filter(v -> v.sqLength() <= 2)
+                .filter(v -> v.sqLength() == 1 || v.x*primaryDirection.x + v.y*primaryDirection.y + v.z*primaryDirection.z >= 1) // Not pointing away from primary direction
                 .toArray(IntVector[]::new);
         branchDirections = Arrays.stream(directions)
-                .filter(v -> v.x*primaryDirection.x + v.y*primaryDirection.y + v.z*primaryDirection.z >= 0) // Not pointing away from primary direction
-                .filter(v -> v.sqLength() == 2) // Diagonal
+                .filter(v -> v.sqLength() >= 2) // Diagonal
                 .toArray(IntVector[]::new);
+
+        for(IntVector direction : directions)
+            visibilityDirections.put(direction, new BitSet(region.volume()));
     }
 
     public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
@@ -141,7 +141,8 @@ public class Hull {
     public void initialize() {
         visibility.clear();
         occluding.clear();
-        visibilityDirections.clear();
+        for(BitSet directionalVisibility : visibilityDirections.values())
+            directionalVisibility.clear();
 
         long start = System.currentTimeMillis();
         region.forEach((x, y, z) -> {
@@ -149,7 +150,7 @@ public class Hull {
             if (isOccluding(Config.world.getBlockAt(x, y, z).getType()))
                 occluding.set(block.toId(region));
         });
-        forEachBorder((root, direction) -> updateBlocks(new NullList<>(), root, direction));
+        forEachBorder((root, direction) -> updateBlocks(new NullList<>(), root, direction, visibilityDirections.get(direction)));
         FightSystem.getPlugin().getLogger().log(Level.INFO, () -> "[HullHider] initialisation finished: " + (System.currentTimeMillis() - start) + " ms, visible blocks: " + visibility.cardinality());
     }
 
@@ -167,10 +168,11 @@ public class Hull {
             return;
 
         List<IntVector> uncovered = new ArrayList<>();
-        int visibleDirections = visibilityDirections.remove(id);
-        for(IntVector direction : directions) {
-            if((directionId(direction) & visibleDirections) != 0)
-                updateBlocks(uncovered, root, direction);
+        for(Map.Entry<IntVector, BitSet> directionalVisibility : visibilityDirections.entrySet()) {
+            if(directionalVisibility.getValue().get(id)) {
+                directionalVisibility.getValue().clear(id);
+                updateBlocks(uncovered, root, directionalVisibility.getKey(), directionalVisibility.getValue());
+            }
         }
 
         if(uncovered.isEmpty())
@@ -241,27 +243,29 @@ public class Hull {
         }
     }
 
-    private void updateBlocks(List<IntVector> uncovered, IntVector block, IntVector direction) {
+    private void updateBlocks(List<IntVector> uncovered, IntVector block, IntVector direction, BitSet directionalVisibility) {
         if (block.notInRegion(region))
             return;
 
         int id = block.toId(region);
+        if(directionalVisibility.get(id))
+            return;
+        directionalVisibility.set(id);
+
         if (!visibility.get(id)) {
             visibility.set(id);
             uncovered.add(block);
         }
 
-        if (occluding.get(id)) {
-            visibilityDirections.compute(id, (pos, v) -> (v == null ? 0 : v) | directionId(direction));
+        if (occluding.get(id))
             return;
-        }
 
-        updateBlocks(uncovered, block.add(direction), direction);
+        updateBlocks(uncovered, block.add(direction), direction, directionalVisibility);
         if(!direction.equals(primaryDirection))
             return;
 
         for(IntVector branchDirection : branchDirections)
-            updateBlocks(uncovered, block.add(branchDirection), branchDirection);
+            updateBlocks(uncovered, block.add(branchDirection), branchDirection, visibilityDirections.get(branchDirection));
     }
 
     private int directionId(IntVector v) {