bug fixes with gps