Renamed some command line interface exceptions.
Some work on command line interface.