Bugfixes

Fixes some bugs and annoyances that I ran into. Also updated documentation to match actual command line arguments.