-Change: some improvements to logging.