minor fixes and/or switching off debug logging.