r20099: Add some comments, and correct others.