email and event fixes