Fix for EventDispatcher
Updated docs and lib.