Updated the TODO file.
Minor tweaks.