many, but minor edits