Fixed a bunch of commands