Fix typos
Add documentation of new command line options
Merge cleanup