diff --git a/src/main/java/com/wimbli/WorldBorder/Config.java b/src/main/java/com/wimbli/WorldBorder/Config.java
index dc99e9a..c1b876a 100644
--- a/src/main/java/com/wimbli/WorldBorder/Config.java
+++ b/src/main/java/com/wimbli/WorldBorder/Config.java
@@ -27,10 +27,10 @@ public class Config
 	private static WorldBorder plugin;
 	private static FileConfiguration cfg = null;
 	private static Logger wbLog = null;
-	public static DecimalFormat coord = new DecimalFormat("0.0");
+	public static volatile DecimalFormat coord = new DecimalFormat("0.0");
 	private static int borderTask = -1;
-	public static WorldFillTask fillTask;
-	public static WorldTrimTask trimTask;
+	public static volatile WorldFillTask fillTask = null;
+	public static volatile WorldTrimTask trimTask = null;
 	private static Runtime rt = Runtime.getRuntime();
 
 	// actual configuration values which can be changed
@@ -43,7 +43,7 @@ public class Config
 	private static boolean DEBUG = false;
 	private static double knockBack = 3.0;
 	private static int timerTicks = 4;
-	private static boolean whooshEffect = false;
+	private static boolean whooshEffect = true;
 	private static boolean portalRedirection = true;
 	private static boolean dynmapEnable = true;
 	private static String dynmapMessage;
@@ -541,7 +541,7 @@ public class Config
 		String msg = cfg.getString("message");
 		shapeRound = cfg.getBoolean("round-border", true);
 		DEBUG = cfg.getBoolean("debug-mode", false);
-		whooshEffect = cfg.getBoolean("whoosh-effect", false);
+		whooshEffect = cfg.getBoolean("whoosh-effect", true);
 		portalRedirection = cfg.getBoolean("portal-redirection", true);
 		knockBack = cfg.getDouble("knock-back-dist", 3.0);
 		timerTicks = cfg.getInt("timer-delay-ticks", 5);
diff --git a/src/main/java/com/wimbli/WorldBorder/cmd/CmdWhoosh.java b/src/main/java/com/wimbli/WorldBorder/cmd/CmdWhoosh.java
index 6f1e90e..67a498e 100644
--- a/src/main/java/com/wimbli/WorldBorder/cmd/CmdWhoosh.java
+++ b/src/main/java/com/wimbli/WorldBorder/cmd/CmdWhoosh.java
@@ -16,7 +16,7 @@ public class CmdWhoosh extends WBCmd
 		minParams = maxParams = 1;
 
 		addCmdExample(nameEmphasized() + "<on|off> - turn knockback effect on or off.");
-		helpText = "Default value: off. This will show a particle effect and play a sound where a player is knocked " +
+		helpText = "Default value: on. This will show a particle effect and play a sound where a player is knocked " +
 			"back from the border.";
 	}
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 26fa666..fc8b167 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -11,17 +11,18 @@ commands:
     aliases: [worldborder, wb]
     usage: |
            /<command> - list available commands (show help).
-           /<command> set <radiusX> [radiusZ] - set world border, centered on you.
+           /<command> help [command] - get help on command usage.
            /<command> [world] set <radiusX> [radiusZ] <x> <z> - set world border.
            /<command> [world] set <radiusX> [radiusZ] spawn - use spawn point.
+           /<command> set <radiusX> [radiusZ] - set world border, centered on you.
            /<command> set <radiusX> [radiusZ] player <name> - center on player.
            /<command> [world] setcorners <x1> <z1> <x2> <z2> - set border from corners.
            /<command> [world] radius <radiusX> [radiusZ] - change border's radius.
+           /<command> list - show border information for all worlds.
            /<command> shape <elliptic|rectangular> - set the default border shape.
            /<command> shape <round|square> - same as above, backwards compatible.
            /<command> [world] clear - remove border for this world.
            /<command> clear all - remove border for all worlds.
-           /<command> list - show border information for all worlds.
            /<command> [world] fill [freq] [pad] [force] - generate world to border.
            /<command> [world] trim [freq] [pad] - trim world outside of border.
            /<command> bypass [player] [on/off] - let player go beyond border.
@@ -31,9 +32,9 @@ commands:
            /<command> whoosh <on/off> - turn knockback effect on or off.
            /<command> getmsg - display border message.
            /<command> setmsg <text> - set border message.
-           /<command> delay <amount> - time between border checks.
            /<command> wshape [world] <elliptic|rectangular|default> - override shape.
            /<command> wshape [world] <round|square|default> - same as above values.
+           /<command> delay <amount> - time between border checks.
            /<command> dynmap <on/off> - turn DynMap border display on or off.
            /<command> dynmapmsg <text> - DynMap border labels will show this.
            /<command> remount <amount> - delay before remounting after knockback.