Improvements and bugfixes for command-line interface

Improvements and bugfixes for command-line interface #362