Added some polish to the CLI.