Improvements to some command stuff