applying some style patches, clarifying terms, etc