More CHanges for maps including use of MarkerWithLabel