Lots of command updates and bug fixes