made more changes, especially to the location manager.