eventdispatcher fixes; closes #18