fixing up logging/events