fixed map bugs