Address feedback from @KrausMatthias

Author: mickenordin

IETF-RFC.md

@@ -111,12 +111,12 @@ take on: the _Sending Server_ role and the _Receiving Server_ role.
 
 A Sending Server is an OCM Provider that holds Resources and exposes
 APIs to allow access to them.  It allows its users to create _Shares_
-or _Invites_ to give other users access to those Resources. A Sending
-Server MAY provide its users with the ability to generate _Invites_ to
-establish contact with other users on other OCM Providers. When doing
-so it MAY provide a _WAYF Page_ to facilitate the Invite Flow. The WAYF
-page MAY be limited to a set of trusted OCM Providers, for instance
-those in the same _Federation_.
+to give other users access to those Resources. A Sending Server MAY
+provide its users with the ability to generate _Invites_ to establish
+contact with other users on other OCM Providers. When doing so it MAY
+provide a _WAYF Page_ to facilitate the Invite Flow. The WAYF page MAY
+be limited to a set of trusted OCM Providers, for instance those in the
+same _Federation_.
 
 
 ### Receiving Server
@@ -139,8 +139,8 @@ the concepts and their relationships.
 An _OCM Provider_ MAY offer its _Users_ an address book tool, where OCM
 Addresses can be stored over time in a labeled and/or searchable way.
 This decouples the act by which the OCM Address string is passed into
-the Sending Server's database from the selection of the Receiving Party
-in preparation for Share Creation.
+the Sending Server's database from the selection of the _Receiving
+Party_ in preparation for Share Creation.
 
 The Address Book entity maintains a collection of contacts for a user
 within the OCM provider. It serves as the primary mechanism for managing
@@ -181,7 +181,7 @@ A Contact represents a federated user relationship established through
 the OCM protocol. Contacts are stored in _Address Books_ and may be
 created through the Invite process or via direct entry. A Contact MAY
 of course contain much more detailed information about the referenced
-user.
+user such as if it was added via _Invites_ or direct entry.
 
 ```
 +-----------------+
@@ -190,8 +190,8 @@ user.
 | - addedDate     |
 | - email         |
 | - name          |
-| - ocmAddress    |
-| - trusted       |
+| - provider      |
+| - userID        |
 +-----------------+
        ^
        | referenced by
@@ -205,17 +205,8 @@ user.
 * __addedDate__: Timestamp of when contact was added
 * __email__: Contact email address (informational)
 * __name__: Human-readable display name
-* __ocmAddress__: Full OCM Address
-* __trusted__: Indicates if contact has been added through the
-               Invite flow (trusted), via direct entry (untrusted)
-               or is blocked
 * __userID__: The identifier of the contact at their OCM Server
-
-##### Contact States
-
-* __Blocked__: Contact blocked from sending Shares
-* __Trusted__: Established through completed Invite flow
-* __Untrusted__: Added directly without Invite verification
+* __provider__: The FQDN of the contact's OCM Server
 
 #### Relationships
 
@@ -234,7 +225,6 @@ on different OCM Servers.
 | - acceptedTime  |
 | - createdTime   |
 | - sender: User  |
-| - status        |
 | - token         |
 +-----------------+
        |
@@ -250,17 +240,9 @@ on different OCM Servers.
 * __acceptedTime__: Timestamp of invite acceptance (if accepted)
 * __createdTime__: Timestamp of invite creation
 * __sender__: Reference to the User who sent the Invite
-* __status__: Current state (pending, accepted, expired, revoked)
 * __token__: Unique, hard-to-guess string generated by Invite Sender
              OCM Server
 
-##### Invite States
-
-* __Accepted__: Invite successfully accepted by Invite Receiver
-* __Expired__: Invite no longer valid after a certain time
-* __Pending__: Invite created but not yet accepted
-* __Revoked__: Invite invalidated by Invite Sender before acceptance
-
 #### Relationships
 
 * An Invite is generated by an Address Book entry action.
@@ -344,11 +326,10 @@ from a Sending Party to a Receiving Party.
 +------------------+                     +------------------+
 | - expiration     |                            | 
 | - name           |                            | mediates access to
-| - owner          |                            v 
-| - permissions[]  |                     +------------------+
-| - protocol       |                     | Resource (remote)|
-| - providerId     |                     +------------------+
-| - requirements[] |
+| - owner          |                            v
+| - protocol       |                     +------------------+
+| - providerId     |                     | Resource (remote)|
+| - requirements[] |                     +------------------+
 | - resourceType   |
 | - sender         |
 | - shareType      |
@@ -368,7 +349,6 @@ from a Sending Party to a Receiving Party.
 * __expiration__: Optional expiration timestamp
 * __name__: Human-readable name of the shared Resource
 * __owner__: OCM Address of the Resource owner
-* __permissions__: Array of granted permissions (read, write, share)
 * __protocol__: Access protocol configuration (webdav, webapp, datatx)
 * __providerId__: Unique identifier for the Share at the provider
 * __requirements__: Array of access requirements (must-use-mfa,