Updated documentation and command line options based on things I'd like to eventually implement
Merged