minor fixes on imac
Fixed merge conflicts
maps highlighted