Update the TODO file again

This commit updates the items in the TODO.rst file again. To keep it
inline with recent changes.