final final changes - map stuff