Slowly editing

For style, mostly, and completeness.