Fix grammar.
Add option name checks to reduce chance of a typo.
Update all libraries to use new option syntax.
Merge branch 'feature/better-options' into develop