Updated parser. Validated command line arguments.