More enhancements to the command line interface.