Completed the introduction of proper logging.