Nicer commandline handling.