Minor bug fixes

Thorough testing is uncovering plenty of small bugs and improvements. No new features implemented in this pre-release, but check the diff to see the tests and changes to the Command class.