Changed command-line options and other minor improvements/corrections