Map fragment improvements

fixed some crashing in the map fragment