More work on command-line args

More work on command-line args