dev refactor and geo update