cleaned up MapActivity and various other files