Fix and cleaning up events.