minor fixes to map, part 2