merge in noiphonehere's change for GPS, will build with this shortly