Added args parser.
Imporved argument parsing.