diff --git a/src/main/java/net/nuggetmc/ai/PlayerAI.java b/src/main/java/net/nuggetmc/ai/PlayerAI.java
index d1eff27..1489c08 100644
--- a/src/main/java/net/nuggetmc/ai/PlayerAI.java
+++ b/src/main/java/net/nuggetmc/ai/PlayerAI.java
@@ -2,23 +2,24 @@ package net.nuggetmc.ai;
 
 import net.nuggetmc.ai.bot.BotManager;
 import net.nuggetmc.ai.command.CommandHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.Arrays;
+
 public class PlayerAI extends JavaPlugin {
 
-    public static final double VERSION = 3.0;
-
     private static PlayerAI instance;
+    private static String version;
 
-    private CommandHandler handler;
     private BotManager manager;
 
     public static PlayerAI getInstance() {
         return instance;
     }
 
-    public CommandHandler getHandler() {
-        return handler;
+    public static String getVersion() {
+        return version;
     }
 
     public BotManager getManager() {
@@ -28,13 +29,14 @@ public class PlayerAI extends JavaPlugin {
     @Override
     public void onEnable() {
         instance = this;
+        version = this.getDescription().getVersion();
 
         // Create Instances
         this.manager = new BotManager();
-        this.handler = new CommandHandler(this);
+        new CommandHandler(this);
 
-        // Register all the things
-        this.registerEvents();
+        // Register event listeners
+        this.registerEvents(manager);
     }
 
     @Override
@@ -42,7 +44,7 @@ public class PlayerAI extends JavaPlugin {
         manager.reset();
     }
 
-    private void registerEvents() {
-        getServer().getPluginManager().registerEvents(manager, this);
+    private void registerEvents(Listener... listeners) {
+        Arrays.stream(listeners).forEach(li -> this.getServer().getPluginManager().registerEvents(li, this));
     }
 }
diff --git a/src/main/java/net/nuggetmc/ai/bot/Bot.java b/src/main/java/net/nuggetmc/ai/bot/Bot.java
index 656335a..6272409 100644
--- a/src/main/java/net/nuggetmc/ai/bot/Bot.java
+++ b/src/main/java/net/nuggetmc/ai/bot/Bot.java
@@ -6,7 +6,6 @@ import net.minecraft.server.v1_16_R3.*;
 import net.nuggetmc.ai.PlayerAI;
 import net.nuggetmc.ai.utils.BotUtils;
 import net.nuggetmc.ai.utils.MathUtils;
-import net.nuggetmc.ai.utils.MojangAPI;
 import org.bukkit.Material;
 import org.bukkit.SoundCategory;
 import org.bukkit.World;
@@ -18,35 +17,44 @@ import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.entity.Damageable;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.UUID;
 
 public class Bot extends EntityPlayer {
 
     public Vector velocity;
+    private Vector oldVelocity;
+
+    private boolean removeOnDeath;
 
     private byte aliveTicks;
-    private byte kbTicks;
-    private byte jumpTicks;
+    private byte fireTicks;
     private byte groundTicks;
+    private byte jumpTicks;
+    private byte kbTicks;
+    private byte noFallTicks;
 
     private final Vector offset;
 
-    public Bot(MinecraftServer minecraftServer, WorldServer worldServer, GameProfile profile, PlayerInteractManager manager) {
+    private Bot(MinecraftServer minecraftServer, WorldServer worldServer, GameProfile profile, PlayerInteractManager manager) {
         super(minecraftServer, worldServer, profile, manager);
 
         this.velocity = new Vector(0, 0, 0);
+        this.oldVelocity = velocity.clone();
+        this.noFallTicks = 60;
+        this.fireTicks = 0;
         this.offset = MathUtils.circleOffset(3);
 
         datawatcher.set(new DataWatcherObject<>(16, DataWatcherRegistry.a), (byte) 0xFF);
     }
 
-    public static Bot createBot(Location loc, String name, String[] skin) {
+    public static Bot createBot(Location loc, String name, String[] skin, boolean removeOnDeath) {
         MinecraftServer nmsServer = ((CraftServer) Bukkit.getServer()).getServer();
         WorldServer nmsWorld = ((CraftWorld) Objects.requireNonNull(loc.getWorld())).getHandle();
 
@@ -60,6 +68,7 @@ public class Bot extends EntityPlayer {
         bot.playerConnection = new PlayerConnection(nmsServer, new NetworkManager(EnumProtocolDirection.CLIENTBOUND), bot);
         bot.setLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
         bot.getBukkitEntity().setNoDamageTicks(0);
+        bot.removeOnDeath = removeOnDeath;
         nmsWorld.addEntity(bot);
 
         bot.renderAll();
@@ -69,19 +78,12 @@ public class Bot extends EntityPlayer {
         return bot;
     }
 
-    public Vector prevVel = new Vector(0, 0, 0);
-    public int velCount;
-
-    public static Bot createBot(Location loc, String name, String skinName) {
-        return createBot(loc, name, MojangAPI.getSkin(skinName));
-    }
-
     private void renderAll() {
         Packet<?>[] packets = getRenderPackets();
         Bukkit.getOnlinePlayers().forEach(p -> render(((CraftPlayer) p).getHandle().playerConnection, packets, false));
     }
 
-    public void render(PlayerConnection connection, Packet<?>[] packets, boolean login) {
+    private void render(PlayerConnection connection, Packet<?>[] packets, boolean login) {
         connection.sendPacket(packets[0]);
         connection.sendPacket(packets[1]);
         connection.sendPacket(packets[2]);
@@ -133,15 +135,23 @@ public class Bot extends EntityPlayer {
         return aliveTicks % i == 0;
     }
 
+    private void sendPacket(Packet<?> packet) {
+        Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));
+    }
+
     @Override
     public void tick() {
         super.tick();
 
+        if (!isAlive()) return;
+
         aliveTicks++;
 
+        if (fireTicks > 0) --fireTicks;
         if (noDamageTicks > 0) --noDamageTicks;
-        if (kbTicks > 0) --kbTicks;
         if (jumpTicks > 0) --jumpTicks;
+        if (kbTicks > 0) --kbTicks;
+        if (noFallTicks > 0) --noFallTicks;
 
         if (checkGround()) {
             if (groundTicks < 5) groundTicks++;
@@ -149,15 +159,12 @@ public class Bot extends EntityPlayer {
             groundTicks = 0;
         }
 
-        Player player = getBukkitEntity();
-        if (player.isDead()) return;
-
         updateLocation();
 
-        double health = player.getHealth();
-        double maxHealth = player.getHealthScale();
-        double regenAmount = 0.05;
-        double amount;
+        float health = getHealth();
+        float maxHealth = getMaxHealth();
+        float regenAmount = 0.05f;
+        float amount;
 
         if (health < maxHealth - regenAmount) {
             amount = health + regenAmount;
@@ -165,14 +172,62 @@ public class Bot extends EntityPlayer {
             amount = maxHealth;
         }
 
-        player.setHealth(amount);
+        setHealth(amount);
+
+        fireDamageCheck();
+
+        if (!isAlive()) return;
+
+        fallDamageCheck();
+
+        oldVelocity = velocity.clone();
+    }
+
+    private void fireDamageCheck() {
+        Material type = getLocation().getBlock().getType();
+
+        boolean lava = type == org.bukkit.Material.LAVA;
+
+        if (lava || type == org.bukkit.Material.FIRE || type == Material.SOUL_FIRE) {
+            ignite();
+        }
+
+        if (noDamageTicks == 0) {
+            if (lava) {
+                damageEntity(DamageSource.LAVA, 4);
+                noDamageTicks = 12;
+            } else if (fireTicks > 1) {
+                damageEntity(DamageSource.FIRE, 1);
+                noDamageTicks = 20;
+            }
+        }
+
+        if (fireTicks == 1) {
+            setOnFirePackets(false);
+        }
+    }
+
+    public void ignite() {
+        if (fireTicks <= 1) setOnFirePackets(true);
+        fireTicks = 100;
+    }
+
+    public void setOnFirePackets(boolean onFire) {
+        datawatcher.set(new DataWatcherObject<>(0, DataWatcherRegistry.a), onFire ? (byte) 1 : (byte) 0);
+        sendPacket(new PacketPlayOutEntityMetadata(getId(), datawatcher, false));
+    }
+
+    private void fallDamageCheck() {
+        if (groundTicks == 0 || noFallTicks != 0) return;
+        double y = oldVelocity.getY();
+        if (y >= -0.8 || BotUtils.NO_FALL.contains(getLocation().getBlock().getType())) return;
+
+        damageEntity(DamageSource.FALL, (float) Math.pow(3.6, -y));
     }
 
     private void updateLocation() {
         double y;
 
-        // Check to reset y velocity if staying in the same position
-
         if (isInWater()) {
             y = Math.min(velocity.getY() + 0.1, 0.1);
             addFriction(0.8);
@@ -222,10 +277,13 @@ public class Bot extends EntityPlayer {
         jump(new Vector(0, 0.5, 0));
     }
 
-    public void attack(org.bukkit.entity.Entity entity) {
+    public void attack(org.bukkit.entity.Entity entity) { // TODO botfight fix
         faceLocation(entity.getLocation());
         punch();
-        attack(((CraftEntity) entity).getHandle());
+
+        if (entity instanceof Damageable) {
+            ((Damageable) entity).damage(2, getBukkitEntity());
+        }
     }
 
     public void punch() {
@@ -285,13 +343,42 @@ public class Bot extends EntityPlayer {
         getBukkitEntity().remove();
     }
 
-    public void remove() {
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
-            connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, this));
-        }
+    public void removeVisually() {
+        this.removeTab();
+        this.setDead();
+    }
 
-        getBukkitEntity().remove();
+    private void removeTab() {
+        sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, this));
+    }
+
+    private void setDead() {
+        this.dead = true;
+        this.defaultContainer.b(this);
+        if (this.activeContainer != null) {
+            this.activeContainer.b(this);
+        }
+    }
+
+    private void dieCheck() {
+        if (removeOnDeath) {
+            PlayerAI plugin = PlayerAI.getInstance();
+            plugin.getManager().remove(this);
+            this.removeTab();
+            Bukkit.getScheduler().runTaskLater(plugin, this::setDead, 30);
+        }
+    }
+
+    @Override
+    public void die() {
+        super.die();
+        this.dieCheck();
+    }
+
+    @Override
+    public void die(DamageSource damageSource) {
+        super.die(damageSource);
+        this.dieCheck();
     }
 
     @Override
@@ -380,15 +467,10 @@ public class Bot extends EntityPlayer {
             yaw = vals[0];
             pitch = vals[1];
 
-            PacketPlayOutEntityHeadRotation packet = new PacketPlayOutEntityHeadRotation(getBukkitEntity().getHandle(), (byte) (yaw * 256 / 360f));
-            Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));
+            sendPacket(new PacketPlayOutEntityHeadRotation(getBukkitEntity().getHandle(), (byte) (yaw * 256 / 360f)));
         }
 
         setYawPitch(yaw, pitch);
-
-        // this causes a lot of lag lol
-        //PacketPlayOutEntity.PacketPlayOutEntityLook packet = new PacketPlayOutEntity.PacketPlayOutEntityLook(getId(), (byte) (yaw * 256 / 360f), (byte) (pitch * 256 / 360f), isOnGround());
-        //Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));
     }
 
     public void attemptBlockPlace(Location loc, Material type) {
@@ -407,14 +489,11 @@ public class Bot extends EntityPlayer {
     public void setItem(org.bukkit.inventory.ItemStack item) {
         if (item == null) item = new org.bukkit.inventory.ItemStack(Material.AIR);
 
-        CraftPlayer player = getBukkitEntity();
-        player.getInventory().setItemInMainHand(item);
+        getBukkitEntity().getInventory().setItemInMainHand(item);
 
-        List<Pair<EnumItemSlot, ItemStack>> equipment = new ArrayList<>();
-        equipment.add(new Pair<>(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(item)));
-
-        PacketPlayOutEntityEquipment packet = new PacketPlayOutEntityEquipment(player.getEntityId(), equipment);
-        Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));
+        sendPacket(new PacketPlayOutEntityEquipment(getId(), new ArrayList<>(Collections.singletonList(
+            new Pair<>(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(item))
+        ))));
     }
 
     public void swim() {
@@ -437,8 +516,7 @@ public class Bot extends EntityPlayer {
 
     private void registerPose(EntityPose pose) {
         datawatcher.set(DataWatcherRegistry.s.a(6), pose);
-        PacketPlayOutEntityMetadata packet = new PacketPlayOutEntityMetadata(getId(), datawatcher, false);
-        Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));
+        sendPacket(new PacketPlayOutEntityMetadata(getId(), datawatcher, false));
     }
 
     @Override
diff --git a/src/main/java/net/nuggetmc/ai/bot/BotManager.java b/src/main/java/net/nuggetmc/ai/bot/BotManager.java
index e0cd2c9..4555eb5 100644
--- a/src/main/java/net/nuggetmc/ai/bot/BotManager.java
+++ b/src/main/java/net/nuggetmc/ai/bot/BotManager.java
@@ -23,12 +23,14 @@ import java.util.Set;
 public class BotManager implements Listener {
 
     private final Agent agent;
+    private final Set<Bot> bots;
     private final NumberFormat numberFormat;
 
-    private final Set<Bot> bots = new HashSet<>();
+    private boolean removeOnDeath = true;
 
     public BotManager() {
         this.agent = new LegacyAgent(this);
+        this.bots = new HashSet<>();
         this.numberFormat = NumberFormat.getInstance(Locale.US);
     }
 
@@ -67,7 +69,7 @@ public class BotManager implements Listener {
         String[] skin = MojangAPI.getSkin(skinName);
 
         for (int i = 0; i < n; i++) {
-            Bot bot = Bot.createBot(loc, name, skin);
+            Bot bot = Bot.createBot(loc, name, skin, removeOnDeath);
             if (i > 0) bot.setVelocity(new Vector(Math.random() - 0.5, 0.5, Math.random() - 0.5).normalize().multiply(f));
         }
 
@@ -81,8 +83,8 @@ public class BotManager implements Listener {
     }
 
     public void reset() {
-        bots.forEach(Bot::remove);
-        bots.clear();
+        bots.forEach(Bot::removeVisually);
+        bots.clear(); // Not always necessary, but a good security measure
     }
 
     @EventHandler
diff --git a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyAgent.java b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyAgent.java
index 7f6ecf0..75951d2 100644
--- a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyAgent.java
+++ b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyAgent.java
@@ -17,10 +17,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 // Yes, this code is very unoptimized, I know.
 public class LegacyAgent extends Agent {
@@ -49,9 +46,17 @@ public class LegacyAgent extends Agent {
     public final Set<Bot> noFace = new HashSet<>();
     public final Set<Player> noJump = new HashSet<>();
 
+    public final Set<Bot> slow = new HashSet<>();
+
     @Override
     protected void tick() {
-        manager.fetch().forEach(this::tickBot);
+        try {
+            manager.fetch().forEach(this::tickBot);
+        } catch (ConcurrentModificationException e) {
+            // Yes this is a really bad way to deal with this issue, but in the future I will have a thing
+            // where when bots die they will be added to a cleanup cache that will be ticked after this (which will be refactored
+            // to the BotManager) and will be removed separately from the set.
+        }
     }
 
     private void center(Bot bot) {
@@ -88,7 +93,7 @@ public class LegacyAgent extends Agent {
 
         Location loc = bot.getLocation();
 
-        Player player = nearestPlayer(loc);
+        Player player = nearestPlayer(bot, loc);
         if (player == null) {
             // LESSLAG if (bot.tickDelay(20))
             stopMining(bot);
@@ -169,9 +174,41 @@ public class LegacyAgent extends Agent {
                         return;
                 }
             }
-        }/* else if (lc && !bot.isOnGround()) {
-            moveSmall(bot, loc, target);
-        }*/
+        } else if (LegacyMats.WATER.contains(loc.getBlock().getType())) {
+            swim(bot, target, playerBot, player, LegacyMats.WATER.contains(loc.clone().add(0, -1, 0).getBlock().getType()));
+        }
+    }
+
+    private void swim(Bot bot, Location loc, Player playerNPC, Player ply, boolean anim) {
+        playerNPC.setSneaking(false);
+
+        Location at = bot.getLocation();
+
+        Vector vector = loc.toVector().subtract(at.toVector());
+        if (at.getBlockY() < ply.getLocation().getBlockY()) {
+            vector.setY(0);
+        }
+
+        vector.normalize().multiply(0.05);
+        vector.setY(vector.getY() * 1.2);
+
+        if (miningAnim.containsKey(playerNPC)) {
+            BukkitRunnable task = miningAnim.get(playerNPC);
+            if (task != null) {
+                task.cancel();
+                miningAnim.remove(playerNPC);
+            }
+        }
+
+        if (anim) {
+            bot.swim();
+        } else {
+            vector.setY(0);
+            vector.multiply(0.7);
+        }
+
+        bot.faceLocation(ply.getLocation());
+        bot.addVelocity(vector);
     }
 
     private void stopMining(Bot bot) {
@@ -222,7 +259,11 @@ public class LegacyAgent extends Agent {
             vel.multiply(0.4);
         }
 
-        vel.setY(0.4);
+        if (slow.contains(bot)) {
+            vel.setY(0).multiply(0.5);
+        } else {
+            vel.setY(0.4);
+        }
 
         bot.jump(vel);
     }
@@ -421,7 +462,7 @@ public class LegacyAgent extends Agent {
                             vector.multiply(0.1);
                             vector.setY(0.5);
 
-                            npc.setVelocity(npc.getVelocity().add(vector));
+                            npc.addVelocity(vector);
                             return true;
                         }
                     }
@@ -444,7 +485,7 @@ public class LegacyAgent extends Agent {
                     vector.multiply(0.1);
                     vector.setY(0);
 
-                    npc.setVelocity(npc.getVelocity().add(vector));
+                    npc.addVelocity(vector);
                 }
 
                 return true;
@@ -761,7 +802,11 @@ public class LegacyAgent extends Agent {
         bot.attack(player);
     }
 
-    private Player nearestPlayer(Location loc) {
+    private Player nearestPlayer(Bot bot, Location loc) {
+        return nearestBot(bot, loc);
+    }
+
+    private Player nearestRealPlayer(Location loc) {
         Player result = null;
 
         for (Player player : Bukkit.getOnlinePlayers()) {
@@ -774,4 +819,24 @@ public class LegacyAgent extends Agent {
 
         return result;
     }
+
+    private Player nearestBot(Bot bot, Location loc) {
+        Player result = null;
+
+        for (Bot otherBot : manager.fetch()) {
+            if (bot == otherBot) continue;
+
+            Player player = otherBot.getBukkitEntity();
+
+            if (!bot.getName().equals(otherBot.getName())) {
+                if (loc.getWorld() != player.getWorld()) continue;
+
+                if (result == null || loc.distance(player.getLocation()) < loc.distance(result.getLocation())) {
+                    result = player;
+                }
+            }
+        }
+
+        return result;
+    }
 }
diff --git a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyBlockCheck.java b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyBlockCheck.java
index 560697f..16b8c4a 100644
--- a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyBlockCheck.java
+++ b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyBlockCheck.java
@@ -130,15 +130,15 @@ public class LegacyBlockCheck {
     }
 
     public void clutch(Bot bot, Player target) {
-        Player player = bot.getBukkitEntity();
+        Location botLoc = bot.getLocation();
 
-        Material type = player.getLocation().add(0, -1, 0).getBlock().getType();
-        Material type2 = player.getLocation().add(0, -2, 0).getBlock().getType();
+        Material type = botLoc.clone().add(0, -1, 0).getBlock().getType();
+        Material type2 = botLoc.clone().add(0, -2, 0).getBlock().getType();
 
         if (!(LegacyMats.SPAWN.contains(type) && LegacyMats.SPAWN.contains(type2))) return;
 
-        if (target.getLocation().getBlockY() >= player.getLocation().getBlockY()) {
-            Location loc = player.getLocation().add(0, -1, 0);
+        if (target.getLocation().getBlockY() >= botLoc.getBlockY()) {
+            Location loc = botLoc.clone().add(0, -1, 0);
 
             Set<Block> face = new HashSet<>(Arrays.asList(
                 loc.clone().add(1, 0, 0).getBlock(),
@@ -155,23 +155,25 @@ public class LegacyBlockCheck {
             }
 
             if (at != null) {
-
-                //agent.slow.add(player);
+                agent.slow.add(bot);
                 agent.noFace.add(bot);
 
                 Bukkit.getScheduler().runTaskLater(plugin, () -> {
                     bot.stand();
-                    //agent.slow.remove(player);
+                    agent.slow.remove(bot);
                 }, 12);
 
                 Bukkit.getScheduler().runTaskLater(plugin, () -> {
                     agent.noFace.remove(bot);
                 }, 15);
 
+                Location faceLoc = at.clone().add(0, -1.5, 0);
+
+                bot.faceLocation(faceLoc);
                 bot.look(BlockFace.DOWN);
 
                 Bukkit.getScheduler().runTaskLater(plugin, () -> {
-                    bot.look(BlockFace.DOWN);
+                    bot.faceLocation(faceLoc);
                 }, 1);
 
                 bot.punch();
diff --git a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyMats.java b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyMats.java
index f744348..9824976 100644
--- a/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyMats.java
+++ b/src/main/java/net/nuggetmc/ai/bot/agent/legacyagent/LegacyMats.java
@@ -82,6 +82,7 @@ public class LegacyMats {
     ));
 
     public static final Set<Material> WATER = new HashSet<>(Arrays.asList(
+        Material.WATER,
         Material.SEAGRASS,
         Material.TALL_SEAGRASS,
         Material.KELP,
diff --git a/src/main/java/net/nuggetmc/ai/command/CommandHandler.java b/src/main/java/net/nuggetmc/ai/command/CommandHandler.java
index 4f0fd14..1109ed6 100644
--- a/src/main/java/net/nuggetmc/ai/command/CommandHandler.java
+++ b/src/main/java/net/nuggetmc/ai/command/CommandHandler.java
@@ -4,9 +4,9 @@ import com.jonahseguin.drink.Drink;
 import com.jonahseguin.drink.annotation.Command;
 import com.jonahseguin.drink.command.DrinkCommandService;
 import com.jonahseguin.drink.utils.ChatUtils;
-import net.nuggetmc.ai.PlayerAI;
 import net.nuggetmc.ai.command.commands.MainCommand;
 import org.bukkit.ChatColor;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -20,7 +20,7 @@ public class CommandHandler {
     private final DrinkCommandService drink;
     private final Map<Class<? extends CommandInstance>, List<String>> help;
 
-    public CommandHandler(PlayerAI plugin) {
+    public CommandHandler(JavaPlugin plugin) {
         drink = (DrinkCommandService) Drink.get(plugin);
         drink.register(new MainCommand(this), "playerai.manage", "bot", "playerai", "pai", "ai", "npc");
         drink.registerCommands();
diff --git a/src/main/java/net/nuggetmc/ai/command/commands/MainCommand.java b/src/main/java/net/nuggetmc/ai/command/commands/MainCommand.java
index 7843219..3c6b751 100644
--- a/src/main/java/net/nuggetmc/ai/command/commands/MainCommand.java
+++ b/src/main/java/net/nuggetmc/ai/command/commands/MainCommand.java
@@ -1,6 +1,9 @@
 package net.nuggetmc.ai.command.commands;
 
-import com.jonahseguin.drink.annotation.*;
+import com.jonahseguin.drink.annotation.Command;
+import com.jonahseguin.drink.annotation.OptArg;
+import com.jonahseguin.drink.annotation.Sender;
+import com.jonahseguin.drink.annotation.Text;
 import com.jonahseguin.drink.utils.ChatUtils;
 import net.nuggetmc.ai.PlayerAI;
 import net.nuggetmc.ai.bot.BotManager;
@@ -16,14 +19,12 @@ import java.util.Locale;
 
 public class MainCommand extends CommandInstance {
 
-    private PlayerAI plugin;
-    private BotManager manager;
+    private final BotManager manager;
 
     public MainCommand(CommandHandler commandHandler) {
         super(commandHandler);
 
-        this.plugin = PlayerAI.getInstance();
-        this.manager = plugin.getManager();
+        this.manager = PlayerAI.getInstance().getManager();
     }
 
     @Command(
@@ -31,7 +32,7 @@ public class MainCommand extends CommandInstance {
     )
     public void root(@Sender Player sender) {
         sender.sendMessage(ChatUtils.LINE);
-        sender.sendMessage(ChatColor.GOLD + "PlayerAI" + ChatColor.GRAY + " [" + ChatColor.RED + "v" + PlayerAI.VERSION + ChatColor.GRAY + "]");
+        sender.sendMessage(ChatColor.GOLD + "PlayerAI" + ChatColor.GRAY + " [" + ChatColor.RED + "v" + PlayerAI.getVersion() + ChatColor.GRAY + "]");
         commandHandler.getHelp(getClass()).forEach(sender::sendMessage);
         sender.sendMessage(ChatUtils.LINE);
     }
diff --git a/src/main/java/net/nuggetmc/ai/utils/BotUtils.java b/src/main/java/net/nuggetmc/ai/utils/BotUtils.java
index e7a2a09..1e1060c 100644
--- a/src/main/java/net/nuggetmc/ai/utils/BotUtils.java
+++ b/src/main/java/net/nuggetmc/ai/utils/BotUtils.java
@@ -1,14 +1,25 @@
 package net.nuggetmc.ai.utils;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
 public class BotUtils {
 
+    public static final Set<Material> NO_FALL = new HashSet<>(Arrays.asList(
+        Material.WATER,
+        Material.LAVA,
+        Material.TWISTING_VINES,
+        Material.VINE
+    ));
+
     public static UUID randomSteveUUID() {
         UUID uuid = UUID.randomUUID();
 
diff --git a/src/main/java/net/nuggetmc/ai/utils/Debugger.java b/src/main/java/net/nuggetmc/ai/utils/Debugger.java
index 0fe9a5e..65d3fa5 100644
--- a/src/main/java/net/nuggetmc/ai/utils/Debugger.java
+++ b/src/main/java/net/nuggetmc/ai/utils/Debugger.java
@@ -1,5 +1,6 @@
 package net.nuggetmc.ai.utils;
 
+import net.minecraft.server.v1_16_R3.*;
 import net.nuggetmc.ai.PlayerAI;
 import net.nuggetmc.ai.bot.Bot;
 import net.nuggetmc.ai.bot.agent.Agent;
@@ -8,6 +9,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -23,7 +25,7 @@ public class Debugger {
 
     private static final String PREFIX = ChatColor.YELLOW + "[DEBUG] " + ChatColor.RESET;
 
-    private CommandSender sender;
+    private final CommandSender sender;
 
     public Debugger(CommandSender sender) {
         this.sender = sender;
@@ -35,7 +37,7 @@ public class Debugger {
     }
 
     private static String[] formStringArray(Object[] objects) {
-        return Arrays.stream(objects).map(Object::toString).toArray(String[]::new);
+        return Arrays.stream(objects).map(String::valueOf).toArray(String[]::new);
     }
 
     private void print(Object... objects) {
@@ -75,6 +77,50 @@ public class Debugger {
         return list.toArray();
     }
 
+    public void fire(String content) {
+        Object[] obj = buildObjects(content);
+
+        if (obj.length != 1) {
+            print("Invalid arguments!");
+            return;
+        }
+
+        boolean b = Boolean.parseBoolean((String) obj[0]);
+
+        PlayerAI.getInstance().getManager().fetch().forEach(bot -> bot.setOnFirePackets(b));
+    }
+
+    public void sendPackets(String content) {
+        Object[] obj = buildObjects(content);
+
+        if (obj.length != 1) {
+            print("Invalid arguments!");
+            return;
+        }
+
+        byte b;
+
+        try {
+            b = Byte.parseByte((String) obj[0]);
+        } catch (NumberFormatException e) {
+            print("Invalid arguments!");
+            return;
+        }
+
+        PlayerAI.getInstance().getManager().fetch().forEach(bot -> {
+            /*DataWatcher datawatcher = bot.getDataWatcher();
+            datawatcher.set(DataWatcherRegistry.s.a(6), EntityPose.DYING);
+            PacketPlayOutEntityMetadata metadata = new PacketPlayOutEntityMetadata(bot.getId(), datawatcher, false);
+            Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(metadata));
+
+            PacketPlayOutEntityStatus packet = new PacketPlayOutEntityStatus(bot, b);
+            Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().playerConnection.sendPacket(packet));*/
+            bot.setHealth(0);
+        });
+
+        Debugger.log("PACKETS_SENT");
+    }
+
     public void trackYVel() {
         if (!(sender instanceof Player)) return;
 
@@ -92,7 +138,7 @@ public class Debugger {
     public void t(String content) {
         Object[] obj = buildObjects(content);
 
-        if (obj.length != 1 || obj[0] instanceof Boolean) {
+        if (obj.length != 1) {
             print("Invalid arguments!");
             return;
         }
diff --git a/src/main/java/net/nuggetmc/ai/utils/PlayerUtils.java b/src/main/java/net/nuggetmc/ai/utils/PlayerUtils.java
index 4805d6e..8e2bce0 100644
--- a/src/main/java/net/nuggetmc/ai/utils/PlayerUtils.java
+++ b/src/main/java/net/nuggetmc/ai/utils/PlayerUtils.java
@@ -11,7 +11,7 @@ public class PlayerUtils {
     }
 
     public static boolean isVulnerableGameMode(GameMode mode) {
-        return mode == GameMode.SURVIVAL || mode == GameMode.ADVENTURE;
+        return mode == GameMode.SURVIVAL || mode == GameMode.ADVENTURE || mode == null;
     }
 
     public static void setAllTargetable(boolean b) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0c035f6..95be763 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: PlayerAI
 main: net.nuggetmc.ai.PlayerAI
-version: 1.0
+version: 3.0-BETA
 api-version: 1.16
 author: HorseNuggets