Streamlined options validation.

Streamlined options validation, bug fixes, and todo changes.