Comments, todos, and random small changes.