diff --git a/src/com/wimbli/WorldBorder/CoordXZ.java b/src/com/wimbli/WorldBorder/CoordXZ.java
index 329e0ef..6b5740e 100644
--- a/src/com/wimbli/WorldBorder/CoordXZ.java
+++ b/src/com/wimbli/WorldBorder/CoordXZ.java
@@ -54,6 +54,6 @@ public class CoordXZ
 	@Override
 	public int hashCode()
 	{
-		return (this.x << 6) + this.z;
+		return (this.x << 9) + this.z;
 	}
 }
diff --git a/src/com/wimbli/WorldBorder/WBCommand.java b/src/com/wimbli/WorldBorder/WBCommand.java
index 5e51972..b02b3aa 100644
--- a/src/com/wimbli/WorldBorder/WBCommand.java
+++ b/src/com/wimbli/WorldBorder/WBCommand.java
@@ -457,7 +457,7 @@ public class WBCommand implements CommandExecutor
 			String pad = "", frequency = "";
 			if (split.length >= 3)
 			{
-				cancel = split[2].equalsIgnoreCase("cancel");
+				cancel = split[2].equalsIgnoreCase("cancel") || split[2].equalsIgnoreCase("stop");
 				confirm = split[2].equalsIgnoreCase("confirm");
 				pause = split[2].equalsIgnoreCase("pause");
 				if (!cancel && !confirm && !pause)
@@ -480,7 +480,7 @@ public class WBCommand implements CommandExecutor
 			String pad = "", frequency = "";
 			if (split.length >= 2)
 			{
-				cancel = split[1].equalsIgnoreCase("cancel");
+				cancel = split[1].equalsIgnoreCase("cancel") || split[1].equalsIgnoreCase("stop");
 				confirm = split[1].equalsIgnoreCase("confirm");
 				pause = split[1].equalsIgnoreCase("pause");
 				if (!cancel && !confirm && !pause)
@@ -511,7 +511,7 @@ public class WBCommand implements CommandExecutor
 			String pad = "", frequency = "";
 			if (split.length >= 3)
 			{
-				cancel = split[2].equalsIgnoreCase("cancel");
+				cancel = split[2].equalsIgnoreCase("cancel") || split[2].equalsIgnoreCase("stop");
 				confirm = split[2].equalsIgnoreCase("confirm");
 				pause = split[2].equalsIgnoreCase("pause");
 				if (!cancel && !confirm && !pause)
@@ -534,7 +534,7 @@ public class WBCommand implements CommandExecutor
 			String pad = "", frequency = "";
 			if (split.length >= 2)
 			{
-				cancel = split[1].equalsIgnoreCase("cancel");
+				cancel = split[1].equalsIgnoreCase("cancel") || split[1].equalsIgnoreCase("stop");
 				confirm = split[1].equalsIgnoreCase("confirm");
 				pause = split[1].equalsIgnoreCase("pause");
 				if (!cancel && !confirm && !pause)
@@ -731,7 +731,7 @@ public class WBCommand implements CommandExecutor
 			}
 
 			String cmd = clrCmd + ((player == null) ? "wb" : "/wb");
-			sender.sendMessage(clrHead + "World generation task is ready for world \"" + fillWorld + "\", padding the map out to " + fillPadding + " blocks beyond the border (default " + CoordXZ.chunkToBlock(13) + "), and the task will try to process up to " + fillFrequency + " chunks per second (default 20).");
+			sender.sendMessage(clrHead + "World generation task is ready for world \"" + fillWorld + "\", padding the map out to " + fillPadding + " blocks beyond the border (default " + CoordXZ.chunkToBlock(13) + "), and the task will try to generate up to " + fillFrequency + " chunks per second (default 20).");
 			sender.sendMessage(clrHead + "This process can take a very long time depending on the world's border size. Also, depending on the chunk processing rate, players will likely experience severe lag for the duration.");
 			sender.sendMessage(clrDesc + "You should now use " + cmd + " fill confirm" + clrDesc + " to start the process.");
 			sender.sendMessage(clrDesc + "You can cancel at any time with " + cmd + " fill cancel" + clrDesc + ", or pause/unpause with " + cmd + " fill pause" + clrDesc + ".");
diff --git a/src/com/wimbli/WorldBorder/WorldBorder.java b/src/com/wimbli/WorldBorder/WorldBorder.java
index 78b997a..6eadffa 100644
--- a/src/com/wimbli/WorldBorder/WorldBorder.java
+++ b/src/com/wimbli/WorldBorder/WorldBorder.java
@@ -10,9 +10,6 @@ public class WorldBorder extends JavaPlugin
 	@Override
 	public void onEnable()
 	{
-		PluginDescriptionFile desc = this.getDescription();
-		System.out.println( desc.getName() + " version " + desc.getVersion() + " loading" );
-
 		// Load (or create new) config file
 		Config.load(this, false);
 
@@ -30,8 +27,6 @@ public class WorldBorder extends JavaPlugin
 	@Override
 	public void onDisable()
 	{
-		PluginDescriptionFile desc = this.getDescription();
-		System.out.println( desc.getName() + " version " + desc.getVersion() + " shutting down" );
 		Config.StopBorderTimer();
 		Config.StoreFillTask();
 		Config.StopFillTask();
diff --git a/src/plugin.yml b/src/plugin.yml
index f12ecbe..7a0a3b6 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,7 +1,7 @@
 name: WorldBorder
 author: Brettflan
 description: Efficient, feature-rich plugin for limiting the size of your worlds.
-version: 1.5.0
+version: 1.5.1_dev
 main: com.wimbli.WorldBorder.WorldBorder
 softdepend:
   - Essentials