TODO cleanup and README updated.