fixed map stuff