Changed eventlistener to eventmanager
Documentation fixes