adjusted some of the event logging.