Update TODO and README