Various tweaks, update TODO.md.