Incorporate darklight's patch, fix command module bug
Now let's actually test this thing already...