fixes to map and events