fixing event/engine and event/listener and adding event/listeners