fixing map bugs (part 3)