Add events to logger, change some trigger checks