More work on the command line options.

Also added some more files.