Add a few more commands, add some better error handling