Cleaning up a bit, and getting ready for command work