MapEvent fixes in progress

Still working on it....