Fixes from Trevor's comments, and some other comment improvements.