Yet another update to command line argumenmts.