Fix handling of some options.
Update README with additional option details.