misc command line fixes

* print help to stdout
* fix --version

Fixes #2103