diff --git a/src/main/java/mmo/Core/ChatAPI/Chat.java b/src/main/java/mmo/Core/ChatAPI/Chat.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/ChatAPI/MMOChatEvent.java b/src/main/java/mmo/Core/ChatAPI/MMOChatEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/CoreAPI/MMOHUDEvent.java b/src/main/java/mmo/Core/CoreAPI/MMOHUDEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/DamageAPI/MMODamageEvent.java b/src/main/java/mmo/Core/DamageAPI/MMODamageEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/DamageAPI/MMODamageType.java b/src/main/java/mmo/Core/DamageAPI/MMODamageType.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/GroupAPI/Group.java b/src/main/java/mmo/Core/GroupAPI/Group.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/GroupAPI/MMOGroupAction.java b/src/main/java/mmo/Core/GroupAPI/MMOGroupAction.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/GroupAPI/MMOGroupEvent.java b/src/main/java/mmo/Core/GroupAPI/MMOGroupEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/InfoAPI/MMOInfoEvent.java b/src/main/java/mmo/Core/InfoAPI/MMOInfoEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/MMO.java b/src/main/java/mmo/Core/MMO.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -26,32 +26,42 @@
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Blaze;
 import org.bukkit.entity.CaveSpider;
 import org.bukkit.entity.Chicken;
+import org.bukkit.entity.ComplexLivingEntity;
 import org.bukkit.entity.Cow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Creeper;
+import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Flying;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Giant;
+import org.bukkit.entity.Golem;
 import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.IronGolem;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.MagmaCube;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.MushroomCow;
+import org.bukkit.entity.NPC;
+import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Pig;
 import org.bukkit.entity.PigZombie;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Silverfish;
 import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Slime;
+import org.bukkit.entity.Snowman;
 import org.bukkit.entity.Spider;
 import org.bukkit.entity.Squid;
 import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Villager;
 import org.bukkit.entity.WaterMob;
 import org.bukkit.entity.Wolf;
 import org.bukkit.entity.Zombie;
@@ -253,90 +263,113 @@ public static String getColor(Player player, LivingEntity target) {
 	 */
 	public static String getSimpleName(LivingEntity target, boolean showOwner) {
 		String name = "";
-		if (target instanceof Player) {
-			if (MMOCore.config_show_display_name) {
-				name += ((Player) target).getName();
+		if (target instanceof ComplexLivingEntity) {
+			if (target instanceof EnderDragon) {
+				name += "Ender Dragon";
 			} else {
-				name += ((Player) target).getDisplayName();
+				name += "Complex";
 			}
-		} else if (target instanceof HumanEntity) {
-			name += ((HumanEntity) target).getName();
-		} else {
-			if (target instanceof Creature) {
-				if (target instanceof Tameable) {
-					if (((Tameable) target).isTamed()) {
-						if (showOwner && ((Tameable) target).getOwner() instanceof Player) {
-							Player owner = (Player) ((Tameable) target).getOwner();
-							if (MMOCore.config_show_display_name) {
-								name += owner.getName() + "'s ";
-							} else {
-								name += owner.getDisplayName() + "'s ";
-							}
+		} else if (target instanceof Creature) {
+			if (target instanceof Tameable) {
+				if (((Tameable) target).isTamed()) {
+					if (showOwner && ((Tameable) target).getOwner() instanceof Player) {
+						Player owner = (Player) ((Tameable) target).getOwner();
+						if (MMOCore.config_show_display_name) {
+							name += owner.getName() + "'s ";
 						} else {
-							name += "Pet ";
+							name += owner.getDisplayName() + "'s ";
 						}
-					}
-				}
-				if (target instanceof Animals) {
-					if (target instanceof Chicken) {
-						name += "Chicken";
-					} else if (target instanceof Cow) {
-						name += "Cow";
-					} else if (target instanceof Pig) {
-						name += "Pig";
-					} else if (target instanceof MushroomCow) {
-						name += "MushroomCow";
-					} else if (target instanceof Sheep) {
-						name += "Sheep";
-					} else if (target instanceof Wolf) {
-						name += "Wolf";
-					} else {
-						name += "Animal";
-					}
-				} else if (target instanceof Monster) {
-					if (target instanceof Blaze) {
-						name += "Blaze";
-					} else if (target instanceof CaveSpider) {
-						name += "CaveSpider";
-					} else if (target instanceof Creeper) {
-						name += "Creeper";
-					} else if (target instanceof Enderman) {
-						name += "Enderman";
-					} else if (target instanceof Giant) {
-						name += "Giant";
-					} else if (target instanceof PigZombie) {
-						name += "PigZombie";
-					} else if (target instanceof Silverfish) {
-						name += "Silverfish";
-					} else if (target instanceof Skeleton) {
-						name += "Skeleton";
-					} else if (target instanceof Spider) {
-						name += "Spider";
-					} else if (target instanceof Zombie) {
-						name += "Zombie";
 					} else {
-						name += "Monster";
+						name += "Pet ";
 					}
-				} else if (target instanceof WaterMob) {
-					if (target instanceof Squid) {
-						name += "Squid";
-					} else {
-						name += "WaterMob";
-					}
-				} else if (target instanceof Flying) {
-					if (target instanceof Ghast) {
-						name += "Ghast";
-					} else {
-						name += "Flying";
-					}
-				} else if (target instanceof Slime) {
-					name += "Slime";
+				}
+			}
+			if(!((Ageable) target).isAdult()) name+="Baby ";
+			if (target instanceof Animals) {
+				if (target instanceof Chicken) {
+					name += "Chicken";
+				} else if (target instanceof MushroomCow) { //Mooshrooms need to be before Cow because they subclass Cow.
+					name += "Mooshroom";
+				} else if (target instanceof Cow) {
+					name += "Cow";
+				} else if (target instanceof Ocelot){
+					name += ((Tameable) target).isTamed() ? "Cat" : "Ocelot";
+				} else if (target instanceof Pig) {
+					name += "Pig";
+				} else if (target instanceof Sheep) {
+					name += "Sheep";
+				} else if (target instanceof Wolf) {
+					name += "Wolf";
+				} else {
+					name += "Animal";
+				}
+			} else if(target instanceof Golem) {
+				if(target instanceof IronGolem) {
+					name += "Iron Golem";
+				} else if(target instanceof Snowman) {
+					name += "Snow Golem";
 				} else {
-					name += "Creature";
+					name += "Golem";
+				}
+			} else if (target instanceof Monster) {
+				if (target instanceof Blaze) {
+					name += "Blaze";
+				} else if (target instanceof Creeper) {
+					name += "Creeper";
+				} else if (target instanceof Enderman) {
+					name += "Enderman";
+				} else if (target instanceof Giant) {
+					name += "Giant";
+				} else if (target instanceof Silverfish) {
+					name += "Silverfish";
+				} else if (target instanceof Skeleton) {
+					name += "Skeleton";
+				} else if (target instanceof CaveSpider) {
+					name += "CaveSpider";
+				} else if (target instanceof Spider) {
+					name += "Spider";
+				} else if (target instanceof PigZombie) {
+					name += "PigZombie";
+				} else if (target instanceof Zombie) {
+					name += "Zombie";
+				} else {
+					name += "Monster";
+				}
+			} else if (target instanceof NPC) {
+				if (target instanceof Villager) {
+					name += "Villager";
+				} else {
+					name += "NPC";
+				}
+			} else if (target instanceof WaterMob) {
+				if (target instanceof Squid) {
+					name += "Squid";
+				} else {
+					name += "WaterMob";
 				}
 			} else {
-				name += "Unknown";
+				name += "Creature";
 			}
+		} else if (target instanceof Flying) {
+			if (target instanceof Ghast) {
+				name += "Ghast";
+			} else {
+				name += "Flying";
+			}
+		} else if(target instanceof HumanEntity) {
+			if (target instanceof Player && !MMOCore.config_show_display_name) {
+				name += ((Player) target).getDisplayName();
+			} else {
+				name += ((HumanEntity) target).getName();
+			}
+		} else if (target instanceof Slime) {
+			if(target instanceof MagmaCube) {
+				name += "Magma Cube";
+			} else {
+				name += "Slime";
+			}
+		} else {
+			name += "Unknown";
 		}
 		return name;
 	}

diff --git a/src/main/java/mmo/Core/MMOCore.java b/src/main/java/mmo/Core/MMOCore.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -168,7 +168,7 @@ public void loadConfiguration(FileConfiguration cfg) {
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (sender.hasPermission("mmocore.set") && command.getName().equalsIgnoreCase("mmoset")) {
+		if (sender.hasPermission("mmo.core.set") && command.getName().equalsIgnoreCase("mmoset")) {
 			args = MMO.smartSplit(args);
 			MMOPlugin mmo = null;
 			String list = "";
@@ -221,7 +221,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				}
 			}
 			return true;
-		} else if (sender.hasPermission("mmocore.update") && command.getName().equalsIgnoreCase("mmoupdate")) {
+		} else if (sender.hasPermission("mmo.core.update") && command.getName().equalsIgnoreCase("mmoupdate")) {
 			sendMessage(sender, "Checking for updates...");
 			checkVersion();
 			String list = "";
@@ -251,7 +251,7 @@ public void redrawAll(Player player) {
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerJoin(final PlayerJoinEvent event) {
 		final Player player = event.getPlayer();
-		if (player.hasPermission("mmocore.update")) {
+		if (player.hasPermission("mmo.core.update")) {
 			String list = "";
 			for (Plugin p : Arrays.asList(pm.getPlugins())) {
 				if (p instanceof MMOPlugin && ((MMOPlugin) p).update) {

diff --git a/src/main/java/mmo/Core/MMOMinecraft.java b/src/main/java/mmo/Core/MMOMinecraft.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/MMOPlugin.java b/src/main/java/mmo/Core/MMOPlugin.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -50,6 +50,7 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 
+import org.getspout.spoutapi.Spout;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.gui.Container;
 import org.getspout.spoutapi.gui.GenericContainer;
@@ -249,6 +250,7 @@ public void onEnable() {
 				// i18n: Extract main configuration
 				File i18nMain = new File(this.getDataFolder(), "i18n.yml");
 				if (i18nMain.exists()) {
+					@SuppressWarnings("unused")
 					FileConfiguration i18nCfg = YamlConfiguration.loadConfiguration(i18nMain);
 
 					// TODO: Add load from web code here
@@ -523,9 +525,7 @@ public Container getContainer(final SpoutPlayer player, final String anchorName,
 	 * @param title  the title to show
 	 */
 	public void setTitle(final LivingEntity target, final String title) {
-		if (target != null) {
-			SpoutManager.getAppearanceManager().setGlobalTitle(target, title);
-		}
+		if (target != null) Spout.getServer().setTitle(target, title);
 	}
 
 	/**
@@ -535,9 +535,7 @@ public void setTitle(final LivingEntity target, final String title) {
 	 * @param title  the title to show
 	 */
 	public void setTitle(final Player player, final LivingEntity target, final String title) {
-		if (player != null && target != null) {
-			SpoutManager.getAppearanceManager().setPlayerTitle(SpoutManager.getPlayer(player), target, title);
-		}
+		if (player != null && target != null && target instanceof SpoutPlayer) ((SpoutPlayer)target).setTitleFor(SpoutManager.getPlayer(player), title);
 	}
 
 	/**
@@ -546,9 +544,7 @@ public void setTitle(final Player player, final LivingEntity target, final Strin
 	 * @param url	the cloak to show
 	 */
 	public void setCloak(final HumanEntity target, final String url) {
-		if (target != null) {
-			SpoutManager.getAppearanceManager().setGlobalCloak(target, url);
-		}
+		if (target != null && target instanceof SpoutPlayer) ((SpoutPlayer)target).setCape(url);
 	}
 
 	/**
@@ -558,9 +554,7 @@ public void setCloak(final HumanEntity target, final String url) {
 	 * @param url	the cloak to show
 	 */
 	public void setCloak(final Player player, final HumanEntity target, final String url) {
-		if (player != null && target != null) {
-			SpoutManager.getAppearanceManager().setPlayerCloak(SpoutManager.getPlayer(player), target, url);
-		}
+		if (player != null && target != null && target instanceof SpoutPlayer) ((SpoutPlayer) target).setCapeFor(SpoutManager.getPlayer(player), url);
 	}
 
 	/**
@@ -569,9 +563,7 @@ public void setCloak(final Player player, final HumanEntity target, final String
 	 * @param url	the cloak to show
 	 */
 	public void setSkin(final HumanEntity target, final String url) {
-		if (target != null) {
-			SpoutManager.getAppearanceManager().setGlobalSkin(target, url);
-		}
+		if (target != null && target instanceof SpoutPlayer) ((SpoutPlayer) target).setSkin(url);
 	}
 
 	/**
@@ -581,9 +573,7 @@ public void setSkin(final HumanEntity target, final String url) {
 	 * @param url	the cloak to show
 	 */
 	public void setSkin(final Player player, final HumanEntity target, final String url) {
-		if (player != null && target != null) {
-			SpoutManager.getAppearanceManager().setPlayerSkin(SpoutManager.getPlayer(player), target, url);
-		}
+		if (player != null && target != null && target instanceof SpoutPlayer) ((SpoutPlayer) target).setSkinFor(SpoutManager.getPlayer(player), url);
 	}
 
 	/**

diff --git a/src/main/java/mmo/Core/MMOi18n.java b/src/main/java/mmo/Core/MMOi18n.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/PartyAPI/Party.java b/src/main/java/mmo/Core/PartyAPI/Party.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/SQLibrary/DatabaseHandler.java b/src/main/java/mmo/Core/SQLibrary/DatabaseHandler.java
@@ -1,3 +1,19 @@
+/*
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
+ *
+ * mmoCore is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 /**
  * Database Handler
  * Abstract superclass for all subclass database files.

diff --git a/src/main/java/mmo/Core/SQLibrary/HSQLDB.java b/src/main/java/mmo/Core/SQLibrary/HSQLDB.java
@@ -1,3 +1,19 @@
+/*
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
+ *
+ * mmoCore is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 /**
  * HSQLDB
  * Inherited subclass for making a connection to a HSQLDB server.

diff --git a/src/main/java/mmo/Core/SQLibrary/MySQL.java b/src/main/java/mmo/Core/SQLibrary/MySQL.java
@@ -1,3 +1,19 @@
+/*
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
+ *
+ * mmoCore is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 /**
  * MySQL
  * Inherited subclass for making a connection to a MySQL server.

diff --git a/src/main/java/mmo/Core/SQLibrary/SQLite.java b/src/main/java/mmo/Core/SQLibrary/SQLite.java
@@ -1,3 +1,19 @@
+/*
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
+ *
+ * mmoCore is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 /**
  * SQLite
  * Inherited subclass for reading and writing to and from an SQLite file.

diff --git a/src/main/java/mmo/Core/SkillAPI/MMOSkillEvent.java b/src/main/java/mmo/Core/SkillAPI/MMOSkillEvent.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/gui/GenericFace.java b/src/main/java/mmo/Core/gui/GenericFace.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/gui/GenericLivingEntity.java b/src/main/java/mmo/Core/gui/GenericLivingEntity.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -47,6 +47,11 @@ public class GenericLivingEntity extends GenericContainer {
 	String face = "~";
 
 	public GenericLivingEntity() {
+		this(80);
+	}
+
+	public GenericLivingEntity(int width) {
+		def_width = width;
 		this.addChildren(
 				_bar = (Container) new GenericContainer(	// Used for the bar, this.children with an index 1+ are targets
 						new GenericGradient(new Color(0, 0, 0, 0.75f)) //
@@ -177,6 +182,7 @@ public GenericLivingEntity setTargets(LivingEntity... targets) {
 			child.setEntity(targets[i]);
 		}
 		setHeight((targets.length + 1) * (def_height + def_space));
+		setMarginBottom(((targets.length + 1) * (def_height + def_space)) - getHeight() +  def_space);
 		return this;
 	}
 

diff --git a/src/main/java/mmo/Core/util/ArrayListString.java b/src/main/java/mmo/Core/util/ArrayListString.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/java/mmo/Core/util/EnumBitSet.java b/src/main/java/mmo/Core/util/EnumBitSet.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -19,6 +19,11 @@
 import java.util.BitSet;
 
 public class EnumBitSet extends BitSet {
+	/**
+	 * For long term storage.
+	 */
+	private static final long serialVersionUID = -698197717246200488L;
+
 	/**
 	 * Sets the bit at the specified index to the complement of its
 	 * current value.

diff --git a/src/main/java/mmo/Core/util/HashMapString.java b/src/main/java/mmo/Core/util/HashMapString.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,6 +23,11 @@
  * Overrides the .containsKey(), .get() and .remove() methods.
  */
 public class HashMapString<V> extends HashMap<String, V> {
+	/**
+	 * For long term storage.
+	 */
+	private static final long serialVersionUID = 4315151536261362924L;
+
 	public boolean containsKey(String key) {
 		for (String k : keySet()) {
 			if (key.equalsIgnoreCase(k)) {

diff --git a/src/main/java/mmo/Core/util/util.java b/src/main/java/mmo/Core/util/util.java
@@ -1,7 +1,7 @@
 /*
- * This file is part of mmoMinecraft (https://github.com/mmoMinecraftDev).
+ * This file is part of mmoCore <http://github.com/mmoMinecraftDev/mmoCore>.
  *
- * mmoMinecraft is free software: you can redistribute it and/or modify
+ * mmoCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,33 +1,33 @@
 name: mmoCore
+version: ${releaseVersion} b${buildNumber}
+description: Provides the common code for all mmoMinecraft plugins to use.
+author: mmoMinecraftDev
+website: http://mmo.me.uk
+
 main: mmo.Core.MMOCore
-version: 2.3
-website: http://forums.bukkit.org/threads/31054/
-author: Rycochet <rycochet@rycochet.com>
 depend: [Spout]
 
-description: Utility functions for mmo-minecraft
-
 commands:
-  mmoset:
-    description: Sets config options for mmoMinecraft plugins
-    permission: mmocore.set
-    usage: /mmoset <plugin> <path.to.option> <value>
-  mmoupdate:
-    description: Update all mmoMinecraft plugins
-    aliases: [mmoupdate2]
-    permission: mmocore.update
-    usage: /mmoupdate [force]
+    mmoset:
+        description: Sets config options for mmoMinecraft plugins
+        permission: mmo.core.set
+        usage: /mmoset <plugin> <path.to.option> <value>
+    mmoupdate:
+        description: Update all mmoMinecraft plugins
+        aliases: [mmoupdate2]
+        permission: mmo.core.update
+        usage: /mmoupdate [force]
 
 permissions:
-  mmocore.*:
-    description: Access to mmoCore commands
-    default: op
-    children:
-      mmocore.set: true
-      mmocore.update: true
-  mmocore.set:
-    description: Allows you to edit mmoMinecraft module settings
-    default: false
-  mmocore.update:
-    description: Allows you to update all mmoMinecraft plugins
-    default: false
+    mmo.core.*:
+        description: Access to mmoCore commands
+        default: op
+        children:
+            mmo.core.set: true
+            mmo.core.update: true
+    mmo.core.set:
+        description: Allows you to edit mmoMinecraft module settings
+        default: false
+    mmo.core.update:
+        description: Allows you to update all mmoMinecraft plugins
+        default: false