minor improvements, abandon gps for now