Cleaned up validation and options.

Closes #212 

Also reordered readme to be alphabetical