some changes to map stuff