fixed bugs on maps