Changes to event system and overall improved performance.