Update geolocation to use GPS first and code enhancements for DataSync