EventDispatcher, EventHandler, Event

Fix add, remove, dispatch