Late edit pass

- Some improvements/fixes based on the ETSI directive
- Some formatting edits
- Some word choice edits
    - prefer "manufacturer" over "provider"
    - prefer "infrastructure" over "server" when referring to hardware
- Move references to where they belong