Fix argument parsing and add verbosity to output