Moved some stuff around, minor changes to EventManager