some refactoring in MapActivity, cleaned up comments