Improvements to the CLI