Update to clarify comments.

Unformately I added some more TODO items, but they probably won't be reviewed
any time soon.