refactoring location manager and omse activityies in prep for map integration
upadated location controller and comment pop in prep for map integration