Improved command line handling/parsing.