start on more geoloc fixing