minor fixes to map
minor fixes to map, part 2
trying to merge