MapEvent update

Overflow issue and assorted fixes