Better command line interface
More fixes