More code cleanups.
Added new option, "verbose".