Revert "Just some minor changes"

This reverts commit 2c4562a93bf6af54fe2696a56c66c5530b185dc6.
Whoops.

ehm.. whoops.. ignore the previous 'rollback' - this rolls back the
rollback I did on accident. (Rollback-ception ftw!) Also added some
changes to the command code and such