Update TODO.
Small changes in notes and comments.