-fixed a bug in the commandline parsing
-added support for exit