Minor improvements to a couple error messages, and command file parsing.