New TODO's and comments.