geolocation language and some minor changes