Remove EnterFrameDispatcher, many bug fixes