Dramatically improved command line options, including the -d and -f arguments