TODO and README updates