Commenting, doc, and import fixes from Patrick's comments