fixed broken command line argument parsing and related behavior;