v0.10 updates
Cleanup, more v0.10 adaptations, and simpler, normalized options.