Reorganize some todo comments.
Add notes from file.