Various edits for readability and section organization
Section re-organization to keep related topics together