Changed to the EventHandler annotation universally, documentation and stuff.