Rewrite command & map creation

Simplified the command and map creation somewhat.
Also fixed a stupid python indentation error from the
previous commit and updated the docs.