Updated EventManager to better tick events