reorder sections, minor edits