Mostly comment changes, but a couple of fixes to get it all working
right.