minor map fixes, add map type control. fix zoom for one event.
fix merge conflicts