More updates to command line argumenmts.