Added nicer commandline options