Comments, docs, rearrange order of defs.