CLI arg refactor, cleanup, various bugfixes

Fairly significant cleanup release; significant refactor (moved to a diff lib); cleanup of some flags.