Improved player mode switching and event handling