clean up and finished basics of event manager