diff --git a/plugin.yml b/plugin.yml
deleted file mode 100644
index 09f53a54a..000000000
--- a/plugin.yml
+++ /dev/null
@@ -1,382 +0,0 @@
-name: WorldEdit
-main: com.sk89q.worldedit.bukkit.WorldEditPlugin
-version: ${project.version}
-commands:
-    chunkinfo:
-        description: Get information about the chunk that you are inside
-        usage: /<command> 
-        permissions: 'worldedit.chunkinfo'
-    listchunks:
-        description: List chunks that your selection includes
-        usage: /<command> 
-        permissions: 'worldedit.listchunks'
-    delchunks:
-        description: Delete chunks that your selection includes
-        usage: /<command> 
-        permissions: 'worldedit.delchunks'
-    /load:
-        description: Load a schematic into your clipboard
-        usage: /<command> <filename>
-        permissions: 'worldedit.clipboard.load'
-    /save:
-        description: Save a schematic into your clipboard
-        usage: /<command> <filename>
-        permissions: 'worldedit.clipboard.save'
-    /copy:
-        description: Copy the selection to the clipboard
-        usage: /<command> 
-        permissions: 'worldedit.clipboard.copy'
-    /flip:
-        description: Flip the contents of the clipboard
-        usage: /<command> [dir]
-        permissions: 'worldedit.clipboard.flip'
-    /rotate:
-        description: Rotate the contents of the clipboard
-        usage: /<command> <angle-in-degrees>
-        permissions: 'worldedit.clipboard.rotate'
-    /cut:
-        description: Cut the selection to the clipboard
-        usage: /<command> [leave-id]
-        permissions: 'worldedit.clipboard.cut'
-    /paste:
-        description: Paste the clipboard's contents
-        usage: /<command> [-ao] 
-        permissions: 'worldedit.clipboard.paste'
-    clearclipboard:
-        description: Clear your clipboard
-        usage: /<command> 
-        permissions: 'worldedit.clipboard.clear'
-    /limit:
-        description: Modify block change limit
-        usage: /<command> <limit>
-        permissions: 'worldedit.limit'
-    /gmask:
-        description: Set the global mask
-        usage: /<command> [mask]
-        aliases: ['gmask']
-        permissions: 'worldedit.global-mask'
-    we:
-        description: WorldEdit commands
-        usage: /<command> 
-        aliases: ['worldedit']
-    /fast:
-        description: Toggle fast mode
-        usage: /<command> 
-        permissions: 'worldedit.fast'
-    toggleplace:
-        description: 
-        usage: /<command> 
-    searchitem:
-        description: Search for an item
-        usage: /<command> [-bi] <query>
-        aliases: ['/l', 'search']
-    /hcyl:
-        description: Generate a hollow cylinder
-        usage: /<command> <block> <radius> [height] 
-        permissions: 'worldedit.generation.cylinder'
-    /cyl:
-        description: Generate a cylinder
-        usage: /<command> <block> <radius> [height] 
-        permissions: 'worldedit.generation.cylinder'
-    /hsphere:
-        description: Generate a hollow sphere
-        usage: /<command> <block> <radius> [raised?] 
-        permissions: 'worldedit.generation.sphere'
-    /sphere:
-        description: Generate a filled sphere
-        usage: /<command> <block> <radius> [raised?] 
-        permissions: 'worldedit.generation.sphere'
-    forestgen:
-        description: Generate a forest
-        usage: /<command> [size] [type] [density]
-        permissions: 'worldedit.generation.forest'
-    pumpkins:
-        description: Generate pumpkin patches
-        usage: /<command> [size]
-        permissions: 'worldedit.generation.pumpkins'
-    /undo:
-        description: Undoes the last action
-        usage: /<command> [times]
-        aliases: ['undo']
-        permissions: 'worldedit.history.undo'
-    /redo:
-        description: Redoes the last action (from history)
-        usage: /<command> [times]
-        aliases: ['redo']
-        permissions: 'worldedit.history.redo'
-    clearhistory:
-        description: Clear your history
-        usage: /<command> 
-        permissions: 'worldedit.history.clear'
-    unstuck:
-        description: Escape from being stuck inside a block
-        usage: /<command> 
-        permissions: 'worldedit.navigation.unstuck'
-    ascend:
-        description: Go up a floor
-        usage: /<command> [# of levels]
-        permissions: 'worldedit.navigation.ascend'
-    descend:
-        description: Go down a floor
-        usage: /<command> [# of floors]
-        permissions: 'worldedit.navigation.descend'
-    ceil:
-        description: Go to the celing
-        usage: /<command> [clearance]
-        permissions: 'worldedit.navigation.ceiling'
-    thru:
-        description: Passthrough walls
-        usage: /<command> 
-        permissions: 'worldedit.navigation.thru'
-    jumpto:
-        description: Teleport to a location
-        usage: /<command> 
-        permissions: 'worldedit.navigation.jumpto'
-    up:
-        description: Go upwards some distance
-        usage: /<command> <block>
-        permissions: 'worldedit.navigation.up'
-    /replace:
-        description: Replace all blocks in the selection with another
-        usage: /<command> [from-block] <to-block>
-        permissions: 'worldedit.region.replace'
-    /stack:
-        description: Repeat the contents of the selection
-        usage: /<command> [-sa] [count] [direction]
-        permissions: 'worldedit.region.stack'
-    /set:
-        description: Set all the blocks inside the selection to a block
-        usage: /<command> <block>
-        permissions: 'worldedit.region.set'
-    /overlay:
-        description: Set a block on top of blocks in the region
-        usage: /<command> <block>
-        permissions: 'worldedit.region.overlay'
-    /naturalize:
-        description: 3 layers of dirt on top then rock below
-        usage: /<command> 
-        permissions: 'worldedit.region.naturalize'
-    /walls:
-        description: Build the four sides of the selection
-        usage: /<command> <block>
-        permissions: 'worldedit.region.walls'
-    /faces:
-        description: Build the walls, ceiling, and roof of a selection
-        usage: /<command> <block>
-        aliases: ['/outline']
-        permissions: 'worldedit.region.faces'
-    /smooth:
-        description: Smooth the elevation in the selection
-        usage: /<command> [iterations]
-        permissions: 'worldedit.region.smooth'
-    /move:
-        description: Move the contents of the selection
-        usage: /<command> [-s] [count] [direction] [leave-id]
-        permissions: 'worldedit.region.move'
-    /regen:
-        description: Regenerates the contents of the selection
-        usage: /<command> 
-        permissions: 'worldedit.regen'
-    cs:
-        description: Execute a CraftScript
-        usage: /<command> <filename> [args...]
-        permissions: 'worldedit.scripting.execute'
-    .s:
-        description: Execute last CraftScript
-        usage: /<command> [args...]
-        permissions: 'worldedit.scripting.execute'
-    /count:
-        description: Counts the number of a certain type of block
-        usage: /<command> <block>
-        permissions: 'worldedit.analysis.count'
-    /size:
-        description: Get information about the selection
-        usage: /<command> 
-        permissions: 'worldedit.selection.size'
-    /shift:
-        description: Shift the selection area
-        usage: /<command> <amount> [direction]
-        permissions: 'worldedit.selection.shift'
-    /sel:
-        description: Choose a region selector
-        usage: /<command> [type]
-        aliases: [',']
-    /chunk:
-        description: Set the selection to your current chunk
-        usage: /<command> 
-        permissions: 'worldedit.selection.chunk'
-    /expand:
-        description: Expand the selection area
-        usage: /<command> <amount> [reverse-amount] <direction>
-        permissions: 'worldedit.selection.expand'
-    /contract:
-        description: Contract the selection area
-        usage: /<command> <amount> [reverse-amount] [direction]
-        permissions: 'worldedit.selection.contract'
-    /pos1:
-        description: Set position 1
-        usage: /<command> 
-        permissions: 'worldedit.selection.pos'
-    /pos2:
-        description: Set position 2
-        usage: /<command> 
-        permissions: 'worldedit.selection.pos'
-    /hpos1:
-        description: Set position 1 to targeted block
-        usage: /<command> 
-        permissions: 'worldedit.selection.hpos'
-    /hpos2:
-        description: Set position 2 to targeted block
-        usage: /<command> 
-        permissions: 'worldedit.selection.hpos'
-    /wand:
-        description: Get the wand object
-        usage: /<command> 
-        permissions: 'worldedit.wand'
-    toggleeditwand:
-        description: Toggle functionality of the edit wand
-        usage: /<command> 
-        permissions: 'worldedit.wand.toggle'
-    /outset:
-        description: Outset the selection area
-        usage: /<command> [-hv] <amount>
-        permissions: 'worldedit.selection.outset'
-    /inset:
-        description: Inset the selection area
-        usage: /<command> [-hv] <amount>
-        permissions: 'worldedit.selection.inset'
-    /distr:
-        description: Get the distribution of blocks in the selection
-        usage: /<command> [-c] 
-        permissions: 'worldedit.analysis.distr'
-    snapshot:
-        description: Snapshot commands
-        usage: /<command> 
-        aliases: ['snap']
-    restore:
-        description: Restore the selection from a snapshot
-        usage: /<command> [snapshot]
-        aliases: ['/restore']
-        permissions: 'worldedit.snapshots.restore'
-    size:
-        description: Set the brush size
-        usage: /<command> [pattern]
-        permissions: 'worldedit.brush.options.size'
-    mask:
-        description: Set the brush mask
-        usage: /<command> [mask]
-        permissions: 'worldedit.brush.options.mask'
-    /:
-        description: Toggle the super pickaxe pickaxe function
-        usage: /<command> 
-        aliases: [',']
-        permissions: 'worldedit.superpickaxe'
-    superpickaxe:
-        description: Select super pickaxe mode
-        usage: /<command> 
-        aliases: ['pickaxe', 'sp']
-    tool:
-        description: Select a tool to bind
-        usage: /<command> 
-    mat:
-        description: Set the brush material
-        usage: /<command> [pattern]
-        aliases: ['material', 'fill']
-        permissions: 'worldedit.brush.options.material'
-    range:
-        description: Set the brush range
-        usage: /<command> [pattern]
-        permissions: 'worldedit.brush.options.range'
-    info:
-        description: Block information tool
-        usage: /<command> 
-        permissions: 'worldedit.tool.info'
-    none:
-        description: Turn off all superpickaxe alternate modes
-        usage: /<command> 
-    farwand:
-        description: Wand tool at a distance
-        usage: /<command> 
-    tree:
-        description: Tree generator tool
-        usage: /<command> [type]
-        permissions: 'worldedit.tool.tree'
-    repl:
-        description: Block replacer tool
-        usage: /<command> <block>
-        permissions: 'worldedit.tool.replacer'
-    cycler:
-        description: Block data cycler tool
-        usage: /<command> 
-        permissions: 'worldedit.tool.data-cycler'
-    floodfill:
-        description: Flood fill tool
-        usage: /<command> 
-        aliases: ['flood']
-        permissions: 'worldedit.tool.flood-fill'
-    brush:
-        description: Brush tool
-        usage: /<command> 
-        aliases: ['br']
-    deltree:
-        description: Floating tree remover tool
-        usage: /<command> 
-        permissions: 'worldedit.tool.deltree'
-    remove:
-        description: Remove all entities of a type
-        usage: /<command> <type> <radius>
-        aliases: ['rem', 'rement']
-        permissions: 'worldedit.remove'
-    /fill:
-        description: Fill a hole
-        usage: /<command>  <block> <radius> [depth] 
-        permissions: 'worldedit.fill'
-    /fillr:
-        description: Fill a hole recursively
-        usage: /<command>  <block> <radius> [depth] 
-        permissions: 'worldedit.fill.recursive'
-    /drain:
-        description: Drain a pool
-        usage: /<command> <radius>
-        permissions: 'worldedit.drain'
-    fixlava:
-        description: Fix lava to be stationary
-        usage: /<command> <radius>
-        permissions: 'worldedit.fixlava'
-    fixwater:
-        description: Fix water to be stationary
-        usage: /<command> <radius>
-        permissions: 'worldedit.fixwater'
-    removeabove:
-        description: Remove blocks above your head. 
-        usage: /<command> [size] [height] 
-        permissions: 'worldedit.removeabove'
-    removebelow:
-        description: Remove blocks below your head. 
-        usage: /<command> [size] [height] 
-        permissions: 'worldedit.removebelow'
-    removenear:
-        description: Remove blocks near you.
-        usage: /<command> <block> [size] 
-        permissions: 'worldedit.removenear'
-    replacenear:
-        description: Replace nearby blocks
-        usage: /<command> <size> <from-id> <to-id> 
-        permissions: 'worldedit.replacenear'
-    snow:
-        description: Simulates snow
-        usage: /<command> [radius]
-        permissions: 'worldedit.snow'
-    thaw:
-        description: Thaws the area
-        usage: /<command> [radius]
-        permissions: 'worldedit.thaw'
-    ex:
-        description: Extinguish nearby fire
-        usage: /<command> [radius]
-        aliases: ['ext', 'extinguish']
-        permissions: 'worldedit.extinguish'
-    butcher:
-        description: Kill all or nearby mobs
-        usage: /<command> [-p] [radius]
-        permissions: 'worldedit.butcher'
diff --git a/src/main/java/com/sk89q/worldedit/commands/ChunkCommands.java b/src/main/java/com/sk89q/worldedit/commands/ChunkCommands.java
index 78374da73..354c18053 100644
--- a/src/main/java/com/sk89q/worldedit/commands/ChunkCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/ChunkCommands.java
@@ -95,6 +95,7 @@ public class ChunkCommands {
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
 
+        player.print("Note that this command does not yet support the mcregion format.");
         LocalConfiguration config = we.getConfiguration();
         
         Set<Vector2D> chunks = session.getSelection(player.getWorld()).getChunks();
diff --git a/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java b/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java
index e202c79cc..819938244 100644
--- a/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java
@@ -155,7 +155,7 @@ public class ClipboardCommands {
         aliases = {"/flip"},
         usage = "[dir]",
         flags = "p",
-        desc = "Flip the contents of the clipboard. To flip it around yourself, use the -p flag.",
+        desc = "Flip the contents of the clipboard.",
         min = 0,
         max = 1
     )
diff --git a/src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java b/src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java
index 2ac39795f..6b6f5cc92 100644
--- a/src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java
@@ -104,9 +104,9 @@ public class GeneralCommands {
     }
 
     @Command(
-        aliases = { "/toggleplace", "toggleplace" },
+        aliases = {"/toggleplace", "toggleplace"},
         usage = "",
-        desc = "",
+        desc = "Switch between your position and pos1 for placement",
         min = 0,
         max = 0
     )
@@ -122,7 +122,7 @@ public class GeneralCommands {
     }
 
     @Command(
-        aliases = { "/searchitem", "/l", "/search", "searchitem", "search" },
+        aliases = {"/searchitem", "/l", "/search", "searchitem", "search"},
         usage = "<query>",
         flags = "bi",
         desc = "Search for an item",
diff --git a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
index ff23a9372..06cb9c6f1 100644
--- a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
@@ -36,7 +36,7 @@ import com.sk89q.worldedit.util.TreeGenerator;
 public class GenerationCommands {
     @Command(
         aliases = {"/hcyl"},
-        usage = "<block> <radius> [height] ",
+        usage = "<block> <radius> [height]",
         desc = "Generate a hollow cylinder",
         min = 2,
         max = 3
@@ -58,7 +58,7 @@ public class GenerationCommands {
 
     @Command(
         aliases = {"/cyl"},
-        usage = "<block> <radius> [height] ",
+        usage = "<block> <radius> [height]",
         desc = "Generate a cylinder",
         min = 2,
         max = 3
@@ -80,7 +80,7 @@ public class GenerationCommands {
 
     @Command(
         aliases = {"/hsphere"},
-        usage = "<block> <radius>[,<radius>,<radius>] [raised?] ",
+        usage = "<block> <radius>[,<radius>,<radius>] [raised?]",
         desc = "Generate a hollow sphere.",
         flags = "q",
         min = 2,
@@ -152,7 +152,7 @@ public class GenerationCommands {
 
     @Command(
         aliases = {"/sphere"},
-        usage = "<block> <radius>[,<radius>,<radius>] [raised?] ",
+        usage = "<block> <radius>[,<radius>,<radius>] [raised?]",
         desc = "Generate a filled sphere.",
         flags = "q",
         min = 2,
diff --git a/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java b/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java
index 11c9917ec..a938200d6 100644
--- a/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java
@@ -103,7 +103,7 @@ public class HistoryCommands {
     }
 
     @Command(
-        aliases = { "/clearhistory", "clearhistory" },
+        aliases = {"/clearhistory", "clearhistory"},
         usage = "",
         desc = "Clear your history",
         min = 0,
diff --git a/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java b/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
index d3f14ca17..1e3c84495 100644
--- a/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
@@ -33,7 +33,7 @@ import com.sk89q.worldedit.*;
  */
 public class NavigationCommands {
     @Command(
-        aliases = {"unstuck"},
+        aliases = {"unstuck", "!"},
         usage = "",
         desc = "Escape from being stuck inside a block",
         min = 0,
diff --git a/src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java b/src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java
index 78c881b81..b17452c27 100644
--- a/src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java
@@ -171,7 +171,7 @@ public class SelectionCommands {
         aliases = {"/chunk"},
         usage = "",
         flags = "s",
-        desc = "Set the selection to your current chunk. The -s flag extends your current selection to the encompassed chunks.",
+        desc = "Set the selection to your current chunk.",
         min = 0,
         max = 0
     )
@@ -575,16 +575,19 @@ public class SelectionCommands {
     }
 
     @Command(
-        aliases = {"/sel", ","},
+        aliases = {"/sel", ";"},
         usage = "[type]",
         desc = "Choose a region selector",
-        min = 1,
+        min = 0,
         max = 1
     )
     public static void select(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
 
+        if (args.length() == 0) {
+            session.getRegionSelector(player.getWorld()).clear();
+        }
         String typeName = args.getString(0);
         if (typeName.equalsIgnoreCase("cuboid")) {
             session.setRegionSelector(player.getWorld(), new CuboidRegionSelector());
diff --git a/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java b/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
index 08539f283..6b16a1261 100644
--- a/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
@@ -40,7 +40,7 @@ import com.sk89q.worldedit.regions.Region;
 public class UtilityCommands {
     @Command(
         aliases = {"/fill"},
-        usage = " <block> <radius> [depth] ",
+        usage = "<block> <radius> [depth]",
         desc = "Fill a hole",
         min = 2,
         max = 3
@@ -70,7 +70,7 @@ public class UtilityCommands {
 
     @Command(
         aliases = {"/fillr"},
-        usage = " <block> <radius> [depth] ",
+        usage = "<block> <radius> [depth]",
         desc = "Fill a hole recursively",
         min = 2,
         max = 3
@@ -119,7 +119,7 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/fixlava", "fixlava" },
+        aliases = {"/fixlava", "fixlava"},
         usage = "<radius>",
         desc = "Fix lava to be stationary",
         min = 1,
@@ -139,7 +139,7 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/fixwater", "fixwater" },
+        aliases = {"/fixwater", "fixwater"},
         usage = "<radius>",
         desc = "Fix water to be stationary",
         min = 1,
@@ -159,9 +159,9 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/removeabove", "removeabove" },
-        usage = "[size] [height] ",
-        desc = "Remove blocks above your head. ",
+        aliases = {"/removeabove", "removeabove"},
+        usage = "[size] [height]",
+        desc = "Remove blocks above your head.",
         min = 0,
         max = 2
     )
@@ -181,9 +181,9 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/removebelow", "removebelow" },
+        aliases = {"/removebelow", "removebelow"},
         usage = "[size] [height] ",
-        desc = "Remove blocks below your head. ",
+        desc = "Remove blocks below you.",
         min = 0,
         max = 2
     )
@@ -203,8 +203,8 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/removenear", "removenear" },
-        usage = "<block> [size] ",
+        aliases = {"/removenear", "removenear"},
+        usage = "<block> [size]",
         desc = "Remove blocks near you.",
         min = 1,
         max = 2
@@ -225,8 +225,8 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/replacenear", "replacenear" },
-        usage = "<size> <from-id> <to-id> ",
+        aliases = {"/replacenear", "replacenear"},
+        usage = "<size> <from-id> <to-id>",
         desc = "Replace nearby blocks",
         min = 3,
         max = 3
@@ -263,7 +263,7 @@ public class UtilityCommands {
     }
     
     @Command(
-        aliases = { "/snow", "snow" },
+        aliases = {"/snow", "snow"},
         usage = "[radius]",
         desc = "Simulates snow",
         min = 0,
@@ -282,7 +282,7 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/thaw", "thaw" },
+        aliases = {"/thaw", "thaw"},
         usage = "[radius]",
         desc = "Thaws the area",
         min = 0,
@@ -301,7 +301,7 @@ public class UtilityCommands {
     }
 
     @Command(
-        aliases = { "/green", "green" },
+        aliases = {"/green", "green"},
         usage = "[radius]",
         desc = "Greens the area",
         min = 0,
@@ -320,7 +320,7 @@ public class UtilityCommands {
     }
 
     @Command(
-            aliases = { "/ex", "/ext", "/extinguish", "ex", "ext", "extinguish" },
+            aliases = {"/ex", "/ext", "/extinguish", "ex", "ext", "extinguish"},
             usage = "[radius]",
             desc = "Extinguish nearby fire",
             min = 0,
diff --git a/src/main/java/com/sk89q/worldedit/dev/DocumentationPrinter.java b/src/main/java/com/sk89q/worldedit/dev/DocumentationPrinter.java
index ebb2b4172..41f73c754 100644
--- a/src/main/java/com/sk89q/worldedit/dev/DocumentationPrinter.java
+++ b/src/main/java/com/sk89q/worldedit/dev/DocumentationPrinter.java
@@ -179,14 +179,14 @@ public class DocumentationPrinter {
                 if (!method.isAnnotationPresent(Command.class)) {
                     continue;
                 }
-    
+
                 Command cmd = method.getAnnotation(Command.class);
 
                 stream.println("    " + cmd.aliases()[0] + ":");
                 stream.println("        description: " + cmd.desc());
-                stream.println("        usage: /<command> "
-                        + (cmd.flags().length() > 0 ? "[-" + cmd.flags() + "] " : "")
-                        + cmd.usage());
+                stream.println("        usage: /<command>"
+                        + (cmd.flags().length() > 0 ? " [-" + cmd.flags() + "]" : "")
+                        + " " + cmd.usage());
                 if (cmd.aliases().length > 1) {
                     stream.println("        aliases: ["
                             + StringUtil.joinQuotedString(cmd.aliases(), ", ", 1, "'")
@@ -200,5 +200,10 @@ public class DocumentationPrinter {
                         + StringUtil.joinQuotedString(cmdPerms.value(), ", ", 0, "'"));
             }
         }
+
+        stream.println();
+        stream.println();
+        stream.println("# Permissions aren't here. Read http://wiki.sk89q.com/wiki/WEPIF/DinnerPerms");
+        stream.println("# for how WorldEdit permissions actually work.");
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 53504da3e..c6f7a6c15 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,15 +4,15 @@ version: ${project.version}
 commands:
     chunkinfo:
         description: Get information about the chunk that you are inside
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.chunkinfo'
     listchunks:
         description: List chunks that your selection includes
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.listchunks'
     delchunks:
         description: Delete chunks that your selection includes
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.delchunks'
     /load:
         description: Load a schematic into your clipboard
@@ -24,11 +24,11 @@ commands:
         permissions: 'worldedit.clipboard.save'
     /copy:
         description: Copy the selection to the clipboard
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.clipboard.copy'
     /flip:
-        description: Flip the contents of the clipboard
-        usage: /<command> [dir]
+        description: Flip the contents of the clipboard.
+        usage: /<command> [-p] [dir]
         permissions: 'worldedit.clipboard.flip'
     /rotate:
         description: Rotate the contents of the clipboard
@@ -40,11 +40,11 @@ commands:
         permissions: 'worldedit.clipboard.cut'
     /paste:
         description: Paste the clipboard's contents
-        usage: /<command> [-ao] 
+        usage: /<command> [-ao]
         permissions: 'worldedit.clipboard.paste'
     clearclipboard:
         description: Clear your clipboard
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.clipboard.clear'
     /limit:
         description: Modify block change limit
@@ -57,34 +57,35 @@ commands:
         permissions: 'worldedit.global-mask'
     we:
         description: WorldEdit commands
-        usage: /<command> 
+        usage: /<command>
         aliases: ['worldedit']
     /fast:
         description: Toggle fast mode
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.fast'
-    toggleplace:
-        description: 
-        usage: /<command> 
-    searchitem:
+    /toggleplace:
+        description:
+        usage: /<command>
+        aliases: ['toggleplace']
+    /searchitem:
         description: Search for an item
         usage: /<command> [-bi] <query>
-        aliases: ['/l', 'search']
+        aliases: ['/l', '/search', 'searchitem', 'search']
     /hcyl:
         description: Generate a hollow cylinder
-        usage: /<command> <block> <radius> [height] 
+        usage: /<command> <block> <radius> [height]
         permissions: 'worldedit.generation.cylinder'
     /cyl:
         description: Generate a cylinder
-        usage: /<command> <block> <radius> [height] 
+        usage: /<command> <block> <radius> [height]
         permissions: 'worldedit.generation.cylinder'
     /hsphere:
-        description: Generate a hollow sphere
-        usage: /<command> <block> <radius> [raised?] 
+        description: Generate a hollow sphere.
+        usage: /<command> [-q] <block> <radius>[,<radius>,<radius>] [raised?]
         permissions: 'worldedit.generation.sphere'
     /sphere:
-        description: Generate a filled sphere
-        usage: /<command> <block> <radius> [raised?] 
+        description: Generate a filled sphere.
+        usage: /<command> [-q] <block> <radius>[,<radius>,<radius>] [raised?]
         permissions: 'worldedit.generation.sphere'
     forestgen:
         description: Generate a forest
@@ -104,21 +105,23 @@ commands:
         permissions: 'worldedit.generation.pyramid'
     /undo:
         description: Undoes the last action
-        usage: /<command> [times]
+        usage: /<command> [times] [player]
         aliases: ['undo']
         permissions: 'worldedit.history.undo'
     /redo:
         description: Redoes the last action (from history)
-        usage: /<command> [times]
+        usage: /<command> [times] [player]
         aliases: ['redo']
         permissions: 'worldedit.history.redo'
-    clearhistory:
+    /clearhistory:
         description: Clear your history
-        usage: /<command> 
+        usage: /<command>
+        aliases: ['clearhistory']
         permissions: 'worldedit.history.clear'
     unstuck:
         description: Escape from being stuck inside a block
-        usage: /<command> 
+        usage: /<command>
+        aliases: ['!']
         permissions: 'worldedit.navigation.unstuck'
     ascend:
         description: Go up a floor
@@ -134,11 +137,11 @@ commands:
         permissions: 'worldedit.navigation.ceiling'
     thru:
         description: Passthrough walls
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.navigation.thru'
     jumpto:
         description: Teleport to a location
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.navigation.jumpto'
     up:
         description: Go upwards some distance
@@ -162,7 +165,7 @@ commands:
         permissions: 'worldedit.region.overlay'
     /naturalize:
         description: 3 layers of dirt on top then rock below
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.region.naturalize'
     /walls:
         description: Build the four sides of the selection
@@ -183,7 +186,7 @@ commands:
         permissions: 'worldedit.region.move'
     /regen:
         description: Regenerates the contents of the selection
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.regen'
     cs:
         description: Execute a CraftScript
@@ -199,24 +202,20 @@ commands:
         permissions: 'worldedit.analysis.count'
     /size:
         description: Get information about the selection
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.selection.size'
     /shift:
         description: Shift the selection area
         usage: /<command> <amount> [direction]
         permissions: 'worldedit.selection.shift'
+    /chunk:
+        description: Set the selection to your current chunk. The -s flag extends your current selection to the encompassed chunks.
+        usage: /<command> [-s]
+        permissions: 'worldedit.selection.chunk'
     /expand:
         description: Expand the selection area
         usage: /<command> <amount> [reverse-amount] <direction>
         permissions: 'worldedit.selection.expand'
-    /sel:
-        description: Choose a region selector
-        usage: /<command> [type]
-        aliases: [',']
-    /chunk:
-        description: Set the selection to your current chunk. The -s flag extends your current selection to the encompassed chunks.
-        usage: /<command> [-s] 
-        permissions: 'worldedit.selection.chunk'
     /contract:
         description: Contract the selection area
         usage: /<command> <amount> [reverse-amount] [direction]
@@ -231,19 +230,19 @@ commands:
         permissions: 'worldedit.selection.pos'
     /hpos1:
         description: Set position 1 to targeted block
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.selection.hpos'
     /hpos2:
         description: Set position 2 to targeted block
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.selection.hpos'
     /wand:
         description: Get the wand object
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.wand'
     toggleeditwand:
         description: Toggle functionality of the edit wand
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.wand.toggle'
     /outset:
         description: Outset the selection area
@@ -255,11 +254,15 @@ commands:
         permissions: 'worldedit.selection.inset'
     /distr:
         description: Get the distribution of blocks in the selection
-        usage: /<command> [-c] 
+        usage: /<command> [-c]
         permissions: 'worldedit.analysis.distr'
+    /sel:
+        description: Choose a region selector
+        usage: /<command> [type]
+        aliases: [';']
     snapshot:
         description: Snapshot commands
-        usage: /<command> 
+        usage: /<command>
         aliases: ['snap']
     restore:
         description: Restore the selection from a snapshot
@@ -274,10 +277,6 @@ commands:
         description: Set the brush mask
         usage: /<command> [mask]
         permissions: 'worldedit.brush.options.mask'
-    range:
-        description: Set the brush range
-        usage: /<command> [pattern]
-        permissions: 'worldedit.brush.options.range'
     /:
         description: Toggle the super pickaxe pickaxe function
         usage: /<command> [on|off]
@@ -285,23 +284,27 @@ commands:
         permissions: 'worldedit.superpickaxe'
     superpickaxe:
         description: Select super pickaxe mode
-        usage: /<command> 
+        usage: /<command>
         aliases: ['pickaxe', 'sp']
     tool:
         description: Select a tool to bind
-        usage: /<command> 
+        usage: /<command>
     mat:
         description: Set the brush material
         usage: /<command> [pattern]
         aliases: ['material', 'fill']
         permissions: 'worldedit.brush.options.material'
+    range:
+        description: Set the brush range
+        usage: /<command> [pattern]
+        permissions: 'worldedit.brush.options.range'
     info:
         description: Block information tool
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.tool.info'
     none:
         description: Turn off all superpickaxe alternate modes
-        usage: /<command> 
+        usage: /<command>
     tree:
         description: Tree generator tool
         usage: /<command> [type]
@@ -312,24 +315,24 @@ commands:
         permissions: 'worldedit.tool.replacer'
     cycler:
         description: Block data cycler tool
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.tool.data-cycler'
     floodfill:
         description: Flood fill tool
-        usage: /<command> 
+        usage: /<command> <pattern> <range>
         aliases: ['flood']
         permissions: 'worldedit.tool.flood-fill'
     brush:
         description: Brush tool
-        usage: /<command> 
+        usage: /<command>
         aliases: ['br']
     deltree:
         description: Floating tree remover tool
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.tool.deltree'
     farwand:
         description: Wand at a distance tool
-        usage: /<command> 
+        usage: /<command>
         permissions: 'worldedit.tool.farwand'
     remove:
         description: Remove all entities of a type
@@ -338,62 +341,67 @@ commands:
         permissions: 'worldedit.remove'
     /fill:
         description: Fill a hole
-        usage: /<command>  <block> <radius> [depth] 
+        usage: /<command> <block> <radius> [depth]
         permissions: 'worldedit.fill'
     /fillr:
         description: Fill a hole recursively
-        usage: /<command>  <block> <radius> [depth] 
+        usage: /<command> <block> <radius> [depth]
         permissions: 'worldedit.fill.recursive'
     /drain:
         description: Drain a pool
         usage: /<command> <radius>
         permissions: 'worldedit.drain'
-    fixlava:
+    /fixlava:
         description: Fix lava to be stationary
         usage: /<command> <radius>
+        aliases: ['fixlava']
         permissions: 'worldedit.fixlava'
-    fixwater:
+    /fixwater:
         description: Fix water to be stationary
         usage: /<command> <radius>
+        aliases: ['fixwater']
         permissions: 'worldedit.fixwater'
-    removeabove:
-        description: Remove blocks above your head. 
-        usage: /<command> [size] [height] 
+    /removeabove:
+        description: Remove blocks above your head.
+        usage: /<command> [size] [height]
+        aliases: ['removeabove']
         permissions: 'worldedit.removeabove'
-    removebelow:
-        description: Remove blocks below your head. 
-        usage: /<command> [size] [height] 
+    /removebelow:
+        description: Remove blocks below your head.
+        usage: /<command> [size] [height]
+        aliases: ['removebelow']
         permissions: 'worldedit.removebelow'
-    removenear:
+    /removenear:
         description: Remove blocks near you.
-        usage: /<command> <block> [size] 
+        usage: /<command> <block> [size]
+        aliases: ['removenear']
         permissions: 'worldedit.removenear'
-    replacenear:
+    /replacenear:
         description: Replace nearby blocks
-        usage: /<command> <size> <from-id> <to-id> 
+        usage: /<command> <size> <from-id> <to-id>
+        aliases: ['replacenear']
         permissions: 'worldedit.replacenear'
-    snow:
+    /snow:
         description: Simulates snow
         usage: /<command> [radius]
+        aliases: ['snow']
         permissions: 'worldedit.snow'
-    thaw:
+    /thaw:
         description: Thaws the area
         usage: /<command> [radius]
+        aliases: ['thaw']
         permissions: 'worldedit.thaw'
-    green:
+    /green:
         description: Greens the area
         usage: /<command> [radius]
+        aliases: ['green']
         permissions: 'worldedit.green'
-    ex:
+    /ex:
         description: Extinguish nearby fire
         usage: /<command> [radius]
-        aliases: ['ext', 'extinguish']
+        aliases: ['/ext', '/extinguish', 'ex', 'ext', 'extinguish']
         permissions: 'worldedit.extinguish'
     butcher:
         description: Kill all or nearby mobs
         usage: /<command> [-p] [radius]
         permissions: 'worldedit.butcher'
-
-
-# Permissions aren't here. Read http://wiki.sk89q.com/wiki/WEPIF/DinnerPerms
-# for how WorldEdit permissions actually work
\ No newline at end of file