Improve help
Tweak the cli.