Updated TODO and README