Improve the CLI a little