Update TODO and README to reflect recent changes