Updated TODO and geo url