Better Location Services

Fixed an issue with location services.