diff --git a/plugin.yml b/plugin.yml
index aff4f2261..0efb4fe94 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,21 +2,6 @@ name: WorldEdit
 main: com.sk89q.worldedit.bukkit.WorldEditPlugin
 version: "WEVERSIONMACRO"
 commands:
-    sphere:
-        description: Choose the sphere brush
-        usage: /<command> [-h] <block> [radius]
-        aliases: ['s']
-    cylinder:
-        description: Choose the cylinder brush
-        usage: /<command> [-h] <block> [radius] [height]
-        aliases: ['cyl', 'c']
-    clipboard:
-        description: Choose the clipboard brush
-        usage: /<command> [-a] 
-        aliases: ['copy']
-    smooth:
-        description: Choose the terrain softener brush
-        usage: /<command> [size] [iterations]
     chunkinfo:
         description: Get information about the chunk that you are inside
         usage: /<command> 
@@ -64,18 +49,18 @@ commands:
     /limit:
         description: Modify block change limit
         usage: /<command> <limit>
-    /sphere:
-        description: Generate a filled sphere
-        usage: /<command> <block> <radius> [raised?] 
-    /cyl:
-        description: Generate a cylinder
-        usage: /<command> <block> <radius> [height] 
     /hcyl:
         description: Generate a hollow cylinder
         usage: /<command> <block> <radius> [height] 
+    /cyl:
+        description: Generate a cylinder
+        usage: /<command> <block> <radius> [height] 
     /hsphere:
         description: Generate a hollow sphere
         usage: /<command> <block> <radius> [raised?] 
+    /sphere:
+        description: Generate a filled sphere
+        usage: /<command> <block> <radius> [raised?] 
     forestgen:
         description: Generate a forest
         usage: /<command> [size] [type] [density]
@@ -114,9 +99,6 @@ commands:
     up:
         description: Go upwards some distance
         usage: /<command> <block>
-    /smooth:
-        description: Smooth the elevation in the selection
-        usage: /<command> [iterations]
     /overlay:
         description: Set a block on top of blocks in the region
         usage: /<command> <block>
@@ -127,6 +109,9 @@ commands:
         description: Build the walls, ceiling, and roof of a selection
         usage: /<command> <block>
         aliases: ['/outline']
+    /smooth:
+        description: Smooth the elevation in the selection
+        usage: /<command> [iterations]
     /replace:
         description: Replace all blocks in the selection with another
         usage: /<command> [from-block] <to-block>
@@ -195,12 +180,6 @@ commands:
     /inset:
         description: Inset the selection area
         usage: /<command> [-hv] <amount>
-    use:
-        description: Choose a snapshot to use
-        usage: /<command> <snapshot>
-    list:
-        description: List snapshots
-        usage: /<command> [num]
     snapshot:
         description: Snapshot commands
         usage: /<command> 
@@ -209,16 +188,28 @@ commands:
         description: Restore the selection from a snapshot
         usage: /<command> [snapshot]
         aliases: ['/restore']
-    area:
-        description: Enable the area super pickaxe pickaxe mode
-        usage: /<command> <radius>
-    recur:
-        description: Enable the recursive super pickaxe pickaxe mode
-        usage: /<command> <radius>
-        aliases: ['recursive']
-    single:
-        description: Enable the single block super pickaxe mode
+    /:
+        description: Toggle the super pickaxe pickaxe function
         usage: /<command> 
+        aliases: [',']
+    superpickaxe:
+        description: Select super pickaxe mode
+        usage: /<command> 
+        aliases: ['pickaxe', 'sp']
+    tool:
+        description: Select a tool to bind
+        usage: /<command> 
+        aliases: ['t']
+    mat:
+        description: Set the brush material
+        usage: /<command> [pattern]
+        aliases: ['material', 'fill']
+    size:
+        description: Set the brush size
+        usage: /<command> [pattern]
+    mask:
+        description: Set the brush mask
+        usage: /<command> [mask]
     none:
         description: Turn off all superpickaxe alternate modes
         usage: /<command> 
@@ -238,28 +229,6 @@ commands:
     tree:
         description: Tree generator tool
         usage: /<command> [type]
-    tool:
-        description: Select a tool to bind
-        usage: /<command> 
-        aliases: ['t']
-    /:
-        description: Toggle the super pickaxe pickaxe function
-        usage: /<command> 
-        aliases: [',']
-    superpickaxe:
-        description: Select super pickaxe mode
-        usage: /<command> 
-        aliases: ['pickaxe', 'sp']
-    mat:
-        description: Set the brush material
-        usage: /<command> [pattern]
-        aliases: ['material', 'fill']
-    size:
-        description: Set the brush size
-        usage: /<command> [pattern]
-    mask:
-        description: Set the brush mask
-        usage: /<command> [mask]
     /fillr:
         description: Fill a hole recursively
         usage: /<command>  <block> <radius> [depth] 
@@ -304,10 +273,3 @@ commands:
     /drain:
         description: Drain a pool
         usage: /<command> <radius>
-    version:
-        description: Get WorldEdit version
-        usage: /<command> 
-        aliases: ['ver']
-    reload:
-        description: Reload WorldEdit
-        usage: /<command> 
diff --git a/src/com/sk89q/worldedit/dev/DocumentationPrinter.java b/src/com/sk89q/worldedit/dev/DocumentationPrinter.java
index 587517cd6..616bf4bef 100644
--- a/src/com/sk89q/worldedit/dev/DocumentationPrinter.java
+++ b/src/com/sk89q/worldedit/dev/DocumentationPrinter.java
@@ -26,6 +26,19 @@ import java.util.List;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.util.StringUtil;
+import com.sk89q.worldedit.commands.ChunkCommands;
+import com.sk89q.worldedit.commands.ClipboardCommands;
+import com.sk89q.worldedit.commands.GeneralCommands;
+import com.sk89q.worldedit.commands.GenerationCommands;
+import com.sk89q.worldedit.commands.HistoryCommands;
+import com.sk89q.worldedit.commands.NavigationCommands;
+import com.sk89q.worldedit.commands.RegionCommands;
+import com.sk89q.worldedit.commands.ScriptingCommands;
+import com.sk89q.worldedit.commands.SelectionCommands;
+import com.sk89q.worldedit.commands.SnapshotUtilCommands;
+import com.sk89q.worldedit.commands.ToolCommands;
+import com.sk89q.worldedit.commands.ToolUtilCommands;
+import com.sk89q.worldedit.commands.UtilityCommands;
 
 public class DocumentationPrinter {
     public static void main(String[] args) throws IOException {
@@ -43,8 +56,22 @@ public class DocumentationPrinter {
     
     private static List<Class<?>> getCommandClasses(File dir) {
         List<Class<?>> classes = new ArrayList<Class<?>>();
+
+        classes.add(ChunkCommands.class);
+        classes.add(ClipboardCommands.class);
+        classes.add(GeneralCommands.class);
+        classes.add(GenerationCommands.class);
+        classes.add(HistoryCommands.class);
+        classes.add(NavigationCommands.class);
+        classes.add(RegionCommands.class);
+        classes.add(ScriptingCommands.class);
+        classes.add(SelectionCommands.class);
+        classes.add(SnapshotUtilCommands.class);
+        classes.add(ToolUtilCommands.class);
+        classes.add(ToolCommands.class);
+        classes.add(UtilityCommands.class);
         
-        for (File f : dir.listFiles()) {
+        /*for (File f : dir.listFiles()) {
             if (!f.getName().matches("^.*\\.java$")) {
                 continue;
             }
@@ -61,7 +88,7 @@ public class DocumentationPrinter {
             }
             
             classes.add(cls);
-        }
+        }*/
         
         return classes;
     }