The start of edits to tighten up sections and layout.

Change-Id: I331e722b82e042b57670835c9520a32a0e5c8222