GPS stuff improved