Make some notes in comments, reformat comment line wrapping.