Add some more notes to TODOs.