More updates on event manager stuff.