Add more options.

Cleanup some code.
Add yet more options.