updated geo data logic + small fixes