Fix #23, finish adding contextual logging.