fixed map bugs (part 2)