Update TODO.org and README.md