Minor corrections and clean up, logger slightly more silent (log to file
only)