Did some more work on logging.