Small refactor to fix spelling and MapEvent clean up

Title says it all.
Detailed comments added to MapEvent.