Docs and comments fixes from James H.