diff --git a/.travis.yml b/.travis.yml
index 2b85aa0..ff88145 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ notifications:
 
 env:
   global:
-    - PROVIDER_VERSION=1.21.4
+    - PROVIDER_VERSION=1.21.5
 
 cache:
   directories:
diff --git a/pom.xml b/pom.xml
index db169a7..dd1b72c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>317-api-minified</artifactId>
-    <version>1.21.4</version>
+    <version>1.21.5</version>
     <name>Parabot 317-API-Minified</name>
 
     <licenses>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>client</artifactId>
-            <version>2.6.1</version>
+            <version>2.8.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>*</artifactId>
diff --git a/src/main/java/org/rev317/min/debug/DAnimation.java b/src/main/java/org/rev317/min/debug/DAnimation.java
index 2e57168..1a0adfd 100644
--- a/src/main/java/org/rev317/min/debug/DAnimation.java
+++ b/src/main/java/org/rev317/min/debug/DAnimation.java
@@ -22,5 +22,9 @@ public class DAnimation extends AbstractDebugger {
     @Override
     public void toggle() {
         enabled = !enabled;
+
+        if (enabled) {
+            Players.getMyPlayer().getAnimation();
+        }
     }
 }
diff --git a/src/main/java/org/rev317/min/debug/DCollisionFlags.java b/src/main/java/org/rev317/min/debug/DCollisionFlags.java
index e4e86e5..9a79012 100644
--- a/src/main/java/org/rev317/min/debug/DCollisionFlags.java
+++ b/src/main/java/org/rev317/min/debug/DCollisionFlags.java
@@ -14,13 +14,13 @@ public class DCollisionFlags extends AbstractDebugger {
 
     @Override
     public void paint(Graphics g) {
-        PaintDebugger p        = Context.getInstance().getPaintDebugger();
-        Tile          location = Players.getMyPlayer().getLocation();
-        Tile          north    = new Tile(location.getX(), location.getY() + 1);
-        Tile          south    = new Tile(location.getX(), location.getY() - 1);
-        Tile          west     = new Tile(location.getX() - 1, location.getY());
-        Tile          east     = new Tile(location.getX() + 1, location.getY());
-        int           flag     = Game.getCollisionFlags()[location.getRegionX()][location.getRegionY()];
+        PaintDebugger p = Context.getInstance().getPaintDebugger();
+        Tile location = Players.getMyPlayer().getLocation();
+        Tile north = new Tile(location.getX(), location.getY() + 1);
+        Tile south = new Tile(location.getX(), location.getY() - 1);
+        Tile west = new Tile(location.getX() - 1, location.getY());
+        Tile east = new Tile(location.getX() + 1, location.getY());
+        int flag = Game.getCollisionFlags()[location.getRegionX()][location.getRegionY()];
         p.addLine("Collision flag: 0x" + String.format("%X", flag));
         p.addLine("Reachable: [ cur: " + location.isReachable() + ", north: " + north.isReachable() + ", south: " + south.isReachable() + ", east: " + east.isReachable() + ", west: " + west.isReachable() + " ]");
         p.addLine("Walkable: [ cur: " + location.isWalkable() + ", north: " + north.isWalkable() + ", south: " + south.isWalkable() + ", east: " + east.isWalkable() + ", west: " + west.isWalkable() + " ]");
diff --git a/src/main/java/org/rev317/min/debug/DGroundItems.java b/src/main/java/org/rev317/min/debug/DGroundItems.java
index 04a3c94..4eb55b8 100644
--- a/src/main/java/org/rev317/min/debug/DGroundItems.java
+++ b/src/main/java/org/rev317/min/debug/DGroundItems.java
@@ -5,7 +5,6 @@ import org.parabot.core.paint.AbstractDebugger;
 import org.parabot.core.paint.PaintDebugger;
 import org.parabot.core.ui.Logger;
 import org.rev317.min.api.methods.GroundItems;
-import org.rev317.min.api.methods.Interfaces;
 import org.rev317.min.api.wrappers.GroundItem;
 
 import java.awt.*;
diff --git a/src/main/java/org/rev317/min/debug/DInterfaces.java b/src/main/java/org/rev317/min/debug/DInterfaces.java
index 2645d5a..da3f9f5 100644
--- a/src/main/java/org/rev317/min/debug/DInterfaces.java
+++ b/src/main/java/org/rev317/min/debug/DInterfaces.java
@@ -25,5 +25,10 @@ public class DInterfaces extends AbstractDebugger {
     @Override
     public void toggle() {
         enabled = !enabled;
+
+        if (enabled) {
+            System.out.println("Open interface: " + Interfaces.getOpenInterfaceId());
+            System.out.println("Open back dialog: " + Interfaces.getBackDialogId());
+        }
     }
 }
diff --git a/src/main/java/org/rev317/min/debug/DInventory.java b/src/main/java/org/rev317/min/debug/DInventory.java
index 2a4a4bf..2169018 100644
--- a/src/main/java/org/rev317/min/debug/DInventory.java
+++ b/src/main/java/org/rev317/min/debug/DInventory.java
@@ -36,8 +36,11 @@ public class DInventory extends AbstractDebugger {
     @Override
     public void toggle() {
         enabled = !enabled;
-        for (Item i : Inventory.getItems()) {
-            System.out.println("ID: " + i.getId() + " Stack: " + i.getStackSize() + " Slot: " + i.getSlot());
+
+        if (enabled) {
+            for (Item i : Inventory.getItems()) {
+                System.out.println("ID: " + i.getId() + " Stack: " + i.getStackSize() + " Slot: " + i.getSlot());
+            }
         }
     }
 
diff --git a/src/main/java/org/rev317/min/debug/DMap.java b/src/main/java/org/rev317/min/debug/DMap.java
index b32ac1a..54bff28 100644
--- a/src/main/java/org/rev317/min/debug/DMap.java
+++ b/src/main/java/org/rev317/min/debug/DMap.java
@@ -26,7 +26,10 @@ public class DMap extends AbstractDebugger {
     @Override
     public void toggle() {
         enabled = !enabled;
-        System.out.println("Location: " + Players.getMyPlayer().getLocation());
-        System.out.println("Plane: " + Game.getPlane());
+
+        if (enabled) {
+            System.out.println("Location: " + Players.getMyPlayer().getLocation());
+            System.out.println("Plane: " + Game.getPlane());
+        }
     }
 }
diff --git a/src/main/java/org/rev317/min/debug/DMouse.java b/src/main/java/org/rev317/min/debug/DMouse.java
index 730ddc7..70d79a8 100644
--- a/src/main/java/org/rev317/min/debug/DMouse.java
+++ b/src/main/java/org/rev317/min/debug/DMouse.java
@@ -23,5 +23,9 @@ public class DMouse extends AbstractDebugger {
     @Override
     public void toggle() {
         enabled = !enabled;
+
+        if (enabled) {
+            System.out.println("Mouse: " + Mouse.getInstance().getPoint().toString());
+        }
     }
 }
diff --git a/src/main/java/org/rev317/min/debug/DNpcs.java b/src/main/java/org/rev317/min/debug/DNpcs.java
index 26e984c..77eb4a0 100644
--- a/src/main/java/org/rev317/min/debug/DNpcs.java
+++ b/src/main/java/org/rev317/min/debug/DNpcs.java
@@ -5,7 +5,6 @@ import org.parabot.core.paint.AbstractDebugger;
 import org.parabot.core.paint.PaintDebugger;
 import org.parabot.core.ui.Logger;
 import org.rev317.min.api.methods.Npcs;
-import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.wrappers.Npc;
 
 import java.awt.*;
@@ -34,7 +33,7 @@ public class DNpcs extends AbstractDebugger {
                 return;
             }
             for (Npc n : Npcs.getNearest()) {
-                System.out.println("ID: " + n.getDef().getId() + " Distance: " + n.distanceTo() + " Location: " + n.getLocation().toString());
+                System.out.println("ID: " + n.getDef().getId() + " Distance: " + n.distanceTo() + " Location: " + n.getLocation().toString() + " Index: " + n.getIndex());
             }
         }
     }
diff --git a/src/main/java/org/rev317/min/debug/DPlayers.java b/src/main/java/org/rev317/min/debug/DPlayers.java
index d523768..a017b33 100644
--- a/src/main/java/org/rev317/min/debug/DPlayers.java
+++ b/src/main/java/org/rev317/min/debug/DPlayers.java
@@ -4,7 +4,6 @@ import org.parabot.core.Context;
 import org.parabot.core.paint.AbstractDebugger;
 import org.parabot.core.paint.PaintDebugger;
 import org.parabot.core.ui.Logger;
-import org.rev317.min.api.methods.GroundItems;
 import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.wrappers.Player;
 
diff --git a/src/main/java/org/rev317/min/debug/DSceneObjects.java b/src/main/java/org/rev317/min/debug/DSceneObjects.java
index ce8d250..117624c 100644
--- a/src/main/java/org/rev317/min/debug/DSceneObjects.java
+++ b/src/main/java/org/rev317/min/debug/DSceneObjects.java
@@ -4,7 +4,6 @@ import org.parabot.core.Context;
 import org.parabot.core.paint.AbstractDebugger;
 import org.parabot.core.paint.PaintDebugger;
 import org.parabot.core.ui.Logger;
-import org.rev317.min.api.methods.GroundItems;
 import org.rev317.min.api.methods.SceneObjects;
 import org.rev317.min.api.wrappers.SceneObject;
 
@@ -13,14 +12,13 @@ import java.util.Comparator;
 
 public class DSceneObjects extends AbstractDebugger {
 
-    private boolean enabled;
-
     public static final Comparator<SceneObject> SCENE_OBJECT_COMPARATOR_DISTANCE = new Comparator<SceneObject>() {
         @Override
         public int compare(SceneObject o1, SceneObject o2) {
-            return o1.distanceTo() > o2.distanceTo() ? 1 : o1.distanceTo() == o2.distanceTo() ? 0 : -1;
+            return Integer.compare(o1.distanceTo(), o2.distanceTo());
         }
     };
+    private boolean enabled;
 
     @Override
     public void paint(Graphics g) {