Better documentation of my options, and some new options added.