Several wording and document structure updates