DEV: Improvements to CLI.