Improved logging.  Simplified some config parameters.