Improved command line arguments.