More options, less bugs

Added a series of hopefully useful command line options.
Squashed a few bugs and reduced potential sources of error.