diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
index 46475797..ecc019e2 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -16,6 +16,7 @@ import me.libraryaddict.disguise.utilities.ReflectionManager;
 import me.libraryaddict.disguise.utilities.DisguiseValues;
 
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Horse.Variant;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -30,7 +31,7 @@ import com.comphenix.protocol.reflect.StructureModifier;
 public abstract class Disguise {
     private static JavaPlugin plugin;
     private DisguiseType disguiseType;
-    private org.bukkit.entity.Entity entity;
+    private Entity entity;
     private boolean hearSelfDisguise = DisguiseAPI.isSelfDisguisesSoundsReplaced();
     private boolean hideArmorFromSelf = DisguiseAPI.isHidingArmorFromSelf();
     private boolean hideHeldItemFromSelf = DisguiseAPI.isHidingHeldItemFromSelf();
@@ -282,7 +283,7 @@ public abstract class Disguise {
     /**
      * Get the disguised entity
      */
-    public org.bukkit.entity.Entity getEntity() {
+    public Entity getEntity() {
         return entity;
     }
 
@@ -410,7 +411,7 @@ public abstract class Disguise {
     /**
      * Set the entity of the disguise. Only used for internal things.
      */
-    public void setEntity(org.bukkit.entity.Entity entity) {
+    public void setEntity(Entity entity) {
         if (this.getEntity() != null) {
             throw new RuntimeException("This disguise is already in use! Try .clone()");
         }
diff --git a/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java b/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
index ea5e1a9e..a84072d9 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
@@ -131,21 +131,19 @@ public enum DisguiseType {
     ZOMBIE_VILLAGER();
 
     static {
+        // We set the entity type in this so that we can safely ignore disguisetypes which don't exist in older versions of MC.
+        // Without erroring up everything.
         for (DisguiseType type : values()) {
             try {
                 EntityType entityType = null;
                 switch (type) {
+                // Disguise item frame isn't supported. So we don't give it a entity type which should prevent it from being..
+                // Usable.
                 case ITEM_FRAME:
                     break;
                 case DONKEY:
-                    entityType = EntityType.HORSE;
-                    break;
                 case MULE:
-                    entityType = EntityType.HORSE;
-                    break;
                 case UNDEAD_HORSE:
-                    entityType = EntityType.HORSE;
-                    break;
                 case SKELETON_HORSE:
                     entityType = EntityType.HORSE;
                     break;
@@ -176,11 +174,10 @@ public enum DisguiseType {
         }
     }
 
-    private int defaultData;
     private int defaultId;
     private int entityId;
     private EntityType entityType;
-    private Class watcherClass;
+    private Class<? extends FlagWatcher> watcherClass;
 
     private DisguiseType(int... obj) {
         for (int i = 0; i < obj.length; i++) {
@@ -192,19 +189,12 @@ public enum DisguiseType {
             case 1:
                 defaultId = value;
                 break;
-            case 2:
-                defaultData = value;
-                break;
             default:
                 break;
             }
         }
     }
 
-    public int getDefaultData() {
-        return defaultData;
-    }
-
     public int getDefaultId() {
         return defaultId;
     }
@@ -237,7 +227,7 @@ public enum DisguiseType {
         this.entityType = entityType;
     }
 
-    public void setWatcherClass(Class c) {
+    public void setWatcherClass(Class<? extends FlagWatcher> c) {
         watcherClass = c;
     }
 
diff --git a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
index dc79010f..9e453ac2 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
@@ -11,6 +11,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -52,15 +53,10 @@ public class FlagWatcher {
         this.disguise = (TargetedDisguise) disguise;
     }
 
-    @Override
-    protected Object clone() {
-        throw new RuntimeException("Please use clone(disguise) instead of clone()");
-    }
-
-    public FlagWatcher clone(Disguise disguise) {
+    public FlagWatcher clone(Disguise owningDisguise) {
         FlagWatcher cloned = null;
         try {
-            cloned = getClass().getConstructor(Disguise.class).newInstance(disguise);
+            cloned = getClass().getConstructor(Disguise.class).newInstance(owningDisguise);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -151,8 +147,8 @@ public class FlagWatcher {
         return newList;
     }
 
-    public org.bukkit.inventory.ItemStack[] getArmor() {
-        org.bukkit.inventory.ItemStack[] armor = new org.bukkit.inventory.ItemStack[4];
+    public ItemStack[] getArmor() {
+        ItemStack[] armor = new ItemStack[4];
         for (int i = 0; i < 4; i++) {
             armor[i] = items[i];
         }
@@ -163,24 +159,24 @@ public class FlagWatcher {
         return disguise;
     }
 
-    private boolean getFlag(int i) {
-        return ((Byte) getValue(0, (byte) 0) & 1 << i) != 0;
+    private boolean getFlag(int byteValue) {
+        return ((Byte) getValue(0, (byte) 0) & 1 << byteValue) != 0;
     }
 
     @Deprecated
-    public org.bukkit.inventory.ItemStack getHeldItem() {
+    public ItemStack getHeldItem() {
         return getItemInHand();
     }
 
-    public org.bukkit.inventory.ItemStack getItemInHand() {
+    public ItemStack getItemInHand() {
         return getItemStack(SlotType.HELD_ITEM);
     }
 
-    public org.bukkit.inventory.ItemStack getItemStack(int slot) {
+    public ItemStack getItemStack(int slot) {
         return items[slot];
     }
 
-    public org.bukkit.inventory.ItemStack getItemStack(SlotType slot) {
+    public ItemStack getItemStack(SlotType slot) {
         return getItemStack(slot.getSlot());
     }
 
@@ -251,7 +247,7 @@ public class FlagWatcher {
         this.addEntityAnimations = isEntityAnimationsAdded;
     }
 
-    public void setArmor(org.bukkit.inventory.ItemStack[] itemstack) {
+    public void setArmor(ItemStack[] itemstack) {
         for (int i = 0; i < itemstack.length; i++)
             setItemStack(i, itemstack[i]);
     }
@@ -261,37 +257,35 @@ public class FlagWatcher {
     }
 
     public void setBurning(boolean setBurning) {
-        setFlag(0, 0, setBurning);
+        setFlag(0, setBurning);
         sendData(0);
     }
 
-    protected void setFlag(int no, int i, boolean flag) {
-        if (no == 0) {
-            modifiedEntityAnimations.add(i);
-        }
-        byte b0 = (Byte) getValue(no, (byte) 0);
+    private void setFlag(int byteValue, boolean flag) {
+        modifiedEntityAnimations.add(byteValue);
+        byte b0 = (Byte) getValue(0, (byte) 0);
         if (flag) {
-            setValue(no, (byte) (b0 | 1 << i));
+            setValue(0, (byte) (b0 | 1 << byteValue));
         } else {
-            setValue(no, (byte) (b0 & ~(1 << i)));
+            setValue(0, (byte) (b0 & ~(1 << byteValue)));
         }
     }
 
     @Deprecated
-    public void setHeldItem(org.bukkit.inventory.ItemStack itemstack) {
+    public void setHeldItem(ItemStack itemstack) {
         setItemInHand(itemstack);
     }
 
     public void setInvisible(boolean setInvis) {
-        setFlag(0, 5, setInvis);
+        setFlag(5, setInvis);
         sendData(0);
     }
 
-    public void setItemInHand(org.bukkit.inventory.ItemStack itemstack) {
+    public void setItemInHand(ItemStack itemstack) {
         setItemStack(SlotType.HELD_ITEM, itemstack);
     }
 
-    public void setItemStack(int slot, org.bukkit.inventory.ItemStack itemStack) {
+    public void setItemStack(int slot, ItemStack itemStack) {
         // Itemstack which is null means that its not replacing the disguises itemstack.
         if (itemStack == null) {
             // Find the item to replace it with
@@ -332,28 +326,28 @@ public class FlagWatcher {
         }
     }
 
-    public void setItemStack(SlotType slot, org.bukkit.inventory.ItemStack itemStack) {
+    public void setItemStack(SlotType slot, ItemStack itemStack) {
         setItemStack(slot.getSlot(), itemStack);
     }
 
     @Deprecated
     public void setRiding(boolean setRiding) {
-        setFlag(0, 2, setRiding);
+        setFlag(2, setRiding);
         sendData(0);
     }
 
     public void setRightClicking(boolean setRightClicking) {
-        setFlag(0, 4, setRightClicking);
+        setFlag(4, setRightClicking);
         sendData(0);
     }
 
     public void setSneaking(boolean setSneaking) {
-        setFlag(0, 1, setSneaking);
+        setFlag(1, setSneaking);
         sendData(0);
     }
 
     public void setSprinting(boolean setSprinting) {
-        setFlag(0, 3, setSprinting);
+        setFlag(3, setSprinting);
         sendData(0);
     }
 
diff --git a/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
index d8df35fd..5cc6e8dc 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
@@ -55,7 +55,7 @@ public class MiscDisguise extends TargetedDisguise {
             if (getType() == DisguiseType.PAINTING) {
                 data = new Random().nextInt(Art.values().length);
             } else {
-                data = disguiseType.getDefaultData();
+                data = 0;
             }
         }
         this.data = data;
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
index 3237af60..b4b1d16d 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java
@@ -52,7 +52,7 @@ public class WolfWatcher extends AgeableWatcher {
     private void setFlag(int no, boolean flag) {
         byte b0 = (Byte) getValue(16, (byte) 0);
         if (flag) {
-            setValue(16, (byte) (b0 | (no)));
+            setValue(16, (byte) (b0 | no));
         } else {
             setValue(16, (byte) (b0 & -(no + 1)));
         }