Merge edits and remove components

Merge all of my edits and remove the "Components" section.

I assume the "Components" section wasn't meant for the final draft.

If you like all of my edits, here's the complete merge for you.  Feel free to pick and choose.