more command-line processing changes