Re-add include comments, and fix some other comments