Fixed a couple of flag-based command line option issues in my first cut.