TODO.txt and more tidying of comments.