Fixed bugs in the command line interface