better TODO.md and other minor changes