CLI: Bugfixes, better help
Release 1.2.1