17 files changed, 143 insertions, 320 deletions
diff --git a/01.md b/01.md
index 50e9c9c..4b33975 100644
--- a/01.md
+++ b/01.md
@@ -4,7 +4,7 @@ NIP-01
 Basic protocol flow description
 -------------------------------
-`draft` `mandatory` `author:fiatjaf` `author:distbit` `author:scsibug` `author:kukks` `author:jb55` `author:semisol`
+`draft` `mandatory` `author:fiatjaf` `author:distbit` `author:scsibug` `author:kukks` `author:jb55` `author:semisol` `author:cameri` `author:Giszmo`
 This NIP defines the basic protocol that should be implemented by everybody. New NIPs may add new optional (or mandatory) fields and messages and features to the structures and flows described here.
@@ -19,11 +19,10 @@ The only object type that exists is the `event`, which has the following format
  "id": <32-bytes lowercase hex-encoded sha256 of the serialized event data>,
  "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
  "created_at": <unix timestamp in seconds>,
-  "kind": <integer>,
+  "kind": <integer between 0 and 65535>,
  "tags": [
-    ["e", <32-bytes hex of the id of another event>, <recommended relay URL>],
+    [<arbitrary string>...],
-    ["p", <32-bytes hex of a pubkey>, <recommended relay URL>],
+    ...
-    ... // other kinds of tags may be included later
  ],
  "content": <arbitrary string>,
  "sig": <64-bytes hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
@@ -43,9 +42,57 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 ]
 ```
+### Tags
+Each tag is an array of strings of arbitrary size, with some conventions around them. Take a look at the example below:
+```json
+{
+  ...,
+  "tags": [
+    ["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
+    ["p", "f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca"],
+    ["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
+    ["alt", "reply"],
+    ...
+  ],
+  ...
+}
+```
+The first element of the tag array is referred to as the tag _name_ or _key_ and the second as the tag _value_. So we can safely say that the event above has an `e` tag set to `"5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36"`, an `alt` tag set to `"reply"` and so on. All elements after the second do not have a conventional name.
+This NIP defines 3 standard tags that can be used accross all event kinds with the same meaning. They are as follows:
+- The `e` tag, used to refer to an event: `["e", <32-bytes hex of the id of another event>, <recommended relay URL, optional>]`
+- The `p` tag, used to refer to another user: `["p", <32-bytes hex of a pubkey>, <recommended relay URL, optional>]`
+- The `a` tag, used to refer to a parameterized replaceable event: `["a", <kind integer>:<32-bytes hex of a pubkey>:<d tag value>, <recommended relay URL, optional>]`
+As a convention, all single-letter key tags are expected to be indexed by relays, such that it is possible, for example, to query or subscribe to events that reference the event `"5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36"` by using the `{"#e": "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36"}` filter.
+### Kinds
+Kinds specify how clients should interpret the meaning of each event and the other fields of each event (e.g. an `"r"` tag may have a meaning in an event of kind 1 and an entirely different meaning in an event of kind 10002). Each NIP may define the meaning of a set of kinds that weren't defined elsewhere. This NIP defines two basic kinds:
+- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. A relay may delete older events once it gets a new one for the same pubkey.
+- `1`: **text note**: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
+And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:
+- for kind `n` such that `1000 <= n < 10000`, events are **regular**, which means they're all expected to be stored by relays.
+- for kind `n` such that `10000 <= n < 20000`, events are **replaceable**, which means that, for each combination of `pubkey` and `kind`, only the latest event is expected to be stored by relays, older versions are expected to be discarded.
+- for kind `n` such that `20000 <= n < 30000`, events are **ephemeral**, which means they are not expected to be stored by relays.
+- for kind `n` such that `30000 <= n < 40000`, events are **parameterized replaceable**, which means that, for each combination of `pubkey`, `kind` and the `d` tag, only the latest event is expected to be stored by relays, older versions are expected to be discarded.
+These are just conventions and relay implementations may differ.
 ## Communication between clients and relays
-Relays expose a websocket endpoint to which clients can connect.
+Relays expose a websocket endpoint to which clients can connect. Clients should open a single websocket connection to each relay and use it for all their subscriptions.
+### Meaning of WebSocket status codes
+- When a websocket is closed by the relay with a status code `4000` that means the client shouldn't try to connect again.
 ### From client to relay: sending events and creating subscriptions
@@ -61,11 +108,10 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
 ```json
 {
-  "ids": <a list of event ids or prefixes>,
+  "ids": <a list of event ids>,
-  "authors": <a list of pubkeys or prefixes, the pubkey of an event must be one of these>,
+  "authors": <a list of lowercase pubkeys, the pubkey of an event must be one of these>,
  "kinds": <a list of a kind numbers>,
-  "#e": <a list of event ids that are referenced in an "e" tag>,
+  "#<single-letter>": <a list of event ids that are referenced in the tag specified by the single letter>,
-  "#p": <a list of pubkeys that are referenced in a "p" tag>,
  "since": <an integer unix timestamp in seconds, events must be newer than this to pass>,
  "until": <an integer unix timestamp in seconds, events must be older than this to pass>,
  "limit": <maximum number of events to be returned in the initial query>
@@ -74,9 +120,9 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
 Upon receiving a `REQ` message, the relay SHOULD query its internal database and return events that match the filter, then store that filter and send again all future events it receives to that same websocket until the websocket is closed. The `CLOSE` event is received with the same `<subscription_id>` or a new `REQ` is sent using the same `<subscription_id>`, in which case it should overwrite the previous subscription.
-Filter attributes containing lists (such as `ids`, `kinds`, or `#e`) are JSON arrays with one or more values.  At least one of the array's values must match the relevant field in an event for the condition itself to be considered a match.  For scalar event attributes such as `kind`, the attribute from the event must be contained in the filter list.  For tag attributes such as `#e`, where an event may have multiple values, the event and filter condition values must have at least one item in common.
+Filter attributes containing lists (`ids`, `authors`, `kinds` and tag filters like `#e`) are JSON arrays with one or more values. At least one of the arrays' values must match the relevant field in an event for the condition to be considered a match. For scalar event attributes such as `authors` and `kind`, the attribute from the event must be contained in the filter list. In the case of tag attributes such as `#e`, for which an event may have multiple values, the event and filter condition values must have at least one item in common.
-The `ids` and `authors` lists contain lowercase hexadecimal strings, which may either be an exact 64-character match, or a prefix of the event value.  A prefix match is when the filter string is an exact string prefix of the event value.  The use of prefixes allows for more compact filters where a large number of values are queried, and can provide some privacy for clients that may not want to disclose the exact authors or events they are searching for.
+The `ids`, `authors`, `#e` and `#p` filter lists MUST contain exact 64-character lowercase hex values.
 The `since` and `until` properties can be used to specify the time range of events returned in the subscription. If a filter includes the `since` property, events with `created_at` greater than or equal to `since` are considered to match the filter. The `until` property is similar except that `created_at` must be less than or equal to `until`. In short, an event matches a filter if `since <= created_at <= until` holds.
@@ -84,32 +130,28 @@ All conditions of a filter that are specified must match for an event for it to
 A `REQ` message may contain multiple filters. In this case, events that match any of the filters are to be returned, i.e., multiple filters are to be interpreted as `||` conditions.
-The `limit` property of a filter is only valid for the initial query and can be ignored afterward. When `limit: n` is present it is assumed that the events returned in the initial query will be the last `n` events ordered by the `created_at`. It is safe to return less events than `limit` specifies, but it is expected that relays do not return (much) more events than requested so clients don't get unnecessarily overwhelmed by data.
+The `limit` property of a filter is only valid for the initial query and MUST be ignored afterwards. When `limit: n` is present it is assumed that the events returned in the initial query will be the last `n` events ordered by the `created_at`. It is safe to return less events than `limit` specifies, but it is expected that relays do not return (much) more events than requested so clients don't get unnecessarily overwhelmed by data.
 ### From relay to client: sending events and notices
-Relays can send 3 types of messages, which must also be JSON arrays, according to the following patterns:
+Relays can send 4 types of messages, which must also be JSON arrays, according to the following patterns:
  * `["EVENT", <subscription_id>, <event JSON as defined above>]`, used to send events requested by clients.
+  * `["OK", <event_id>, <true|false>, <message>]`, used to indicate acceptance or denial of an `EVENT` message.
  * `["EOSE", <subscription_id>]`, used to indicate the _end of stored events_ and the beginning of events newly received in real-time.
  * `["NOTICE", <message>]`, used to send human-readable error messages or other things to clients.
 This NIP defines no rules for how `NOTICE` messages should be sent or treated.
-`EVENT` messages MUST be sent only with a subscription ID related to a subscription previously initiated by the client (using the `REQ` message above).
+- `EVENT` messages MUST be sent only with a subscription ID related to a subscription previously initiated by the client (using the `REQ` message above).
+- `OK` messages MUST be sent in response to `EVENT` messages received from clients, they must have the 3rd parameter set to `true` when an event has been accepted by the relay, `false` otherwise. The 4th parameter MAY be empty when the 3rd is `true`, otherwise it MUST be a string containing a machine-readable single-word prefix followed by a `:` and then a human-readable message. The standardized machine-readable prefixes are: `duplicate`, `pow`, `blocked`, `rate-limited`, `invalid`, and `error` for when none of that fits. Some examples:
-## Basic Event Kinds
+  * `["OK", "b1a649ebe8...", true, ""]`
-  - `0`: `set_metadata`: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. A relay may delete past `set_metadata` events once it gets a new one for the same pubkey.
+  * `["OK", "b1a649ebe8...", true, "pow: difficulty 25>=24"]`
-  - `1`: `text_note`: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
+  * `["OK", "b1a649ebe8...", true, "duplicate: already have this event"]`
-  - `2`: `recommend_server`: the `content` is set to the URL (e.g., `wss://somerelay.com`) of a relay the event creator wants to recommend to its followers.
+  * `["OK", "b1a649ebe8...", false, "blocked: you are banned from posting here"]`
+  * `["OK", "b1a649ebe8...", false, "blocked: please register your pubkey at https://my-expensive-relay.example.com"]`
-A relay may choose to treat different message kinds differently, and it may or may not choose to have a default way to handle kinds it doesn't know about.
+  * `["OK", "b1a649ebe8...", false, "rate-limited: slow down there chief"]`
+  * `["OK", "b1a649ebe8...", false, "invalid: event creation date is too far off from the current time. Is your system clock in sync?"]`
-## Other Notes:
+  * `["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]`
+  * `["OK", "b1a649ebe8...", false, "error: could not connect to the database"]`
- Clients should not open more than one websocket to each relay. One channel can support an unlimited number of subscriptions, so clients should do that.
- The `tags` array can store a case-sensitive tag name as the first element of each subarray, plus arbitrary information afterward (always as strings). This NIP defines `"p"` — meaning "pubkey", which points to a pubkey of someone that is referred to in the event —, and `"e"` — meaning "event", which points to the id of an event this event is quoting, replying to or referring to somehow. See [NIP-10](10.md) for a detailed description of "e" and "p" tags.
- The `<recommended relay URL>` item present on the `"e"` and `"p"` tags is an optional (could be set to `""`) URL of a relay the client could attempt to connect to fetch the tagged event or other events from a tagged profile. It MAY be ignored, but it exists to increase censorship resistance and make the spread of relay addresses more seamless across clients.
- Clients should use the created_at field to judge the age of a metadata event and completely replace older metadata events with newer metadata events regardless of the order in which they arrive.  Clients should not merge any filled fields within older metadata events into empty fields of newer metadata events.
- When a websocket is closed by the relay with a status code 4000 that means the client shouldn't try to connect again.
diff --git a/11.md b/11.md
index ec46b36..c71f89e 100644
--- a/11.md
+++ b/11.md
@@ -118,7 +118,7 @@ field of any event. This is a count of unicode characters. After
 serializing into JSON it may be larger (in bytes), and is still
 subject to the `max_message_length`, if defined.
- `min_pow_difficulty`: new events will require at least this difficulty of PoW, 
+- `min_pow_difficulty`: new events will require at least this difficulty of PoW,
 based on [NIP-13](13.md), or they will be rejected by this server.
 - `auth_required`: this relay requires [NIP-42](42.md) authentication
@@ -129,7 +129,7 @@ Even if set to False, authentication may be required for specific actions.
 ### Event Retention ###
-There may be a cost associated with storing data forever, so relays 
+There may be a cost associated with storing data forever, so relays
 may wish to state retention times. The values stated here are defaults
 for unauthenticated users and visitors. Paid users would likely have
 other policies.
@@ -151,7 +151,7 @@ all, and preferably an error will be provided when those are received.
 }
 ```
-`retention` is a list of specifications: each will apply to either all kinds, or 
+`retention` is a list of specifications: each will apply to either all kinds, or
 a subset of kinds. Ranges may be specified for the kind field as a tuple of inclusive
 start and end values. Events of indicated kind (or all) are then limited to a `count`
 and/or time period.
@@ -161,8 +161,7 @@ a specific `kind` number, by giving a retention time of zero for those `kind` va
 While that is unfortunate, it does allow clients to discover servers that will
 support their protocol quickly via a single HTTP fetch.
-There is no need to specify retention times for _ephemeral events_ as defined
+There is no need to specify retention times for _ephemeral events_ since they are not retained.
-in [NIP-16](16.md) since they are not retained.
 ### Content Limitations ###
@@ -271,7 +270,7 @@ A URL pointing to an image to be used as an icon for the relay. Recommended to b
 As of 2 May 2023 the following `curl` command provided these results.
        >curl -H "Accept: application/nostr+json" https://eden.nostr.land
-        
        {"name":"eden.nostr.land",
        "description":"Eden Nostr Land - Toronto 1-01",
        "pubkey":"00000000827ffaa94bfea288c3dfce4422c794fbb96625b6b31e9049f729d700",
@@ -293,5 +292,5 @@ As of 2 May 2023 the following `curl` command provided these results.
                                  "payment_required":true},
        "payments_url":"https://eden.nostr.land/invoices",
        "fees":{"admission":[{"amount":5000000,"unit":"msats"}],
-                "publication":[]}}, 
+                "publication":[]}},
    "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg"
diff --git a/12.md b/12.md
index 7d1f46e..9357977 100644
--- a/12.md
+++ b/12.md
@@ -4,39 +4,6 @@ NIP-12
 Generic Tag Queries
 -------------------
-`draft` `optional` `author:scsibug` `author:fiatjaf`
+`final` `mandatory` `author:scsibug` `author:fiatjaf`
-Relays may support subscriptions over arbitrary tags.  `NIP-01` requires relays to respond to queries for `e` and `p` tags.  This NIP allows any single-letter tag present in an event to be queried.
+Moved to [NIP-01](01.md).
-The `<filters>` object described in `NIP-01` is expanded to contain arbitrary keys with a `#` prefix.  Any single-letter key in a filter beginning with `#` is a tag query, and MUST have a value of an array of strings.  The filter condition matches if the event has a tag with the same name, and there is at least one tag value in common with the filter and event.  The tag name is the letter without the `#`, and the tag value is the second element. Subsequent elements are ignored for the purposes of tag queries. Note that tag names are case-sensitive.
-Example Subscription Filter
---------------------------
-The following provides an example of a filter that matches events of kind `1` with an `r` tag set to either `foo` or `bar`.
-```
-{
-  "kinds": [1],
-  "#r": ["foo", "bar"]
-}
-```
-Client Behavior
---------------
-Clients SHOULD use the `supported_nips` field to learn if a relay supports generic tag queries. Clients MAY send generic tag queries to any relay, if they are prepared to filter out extraneous responses from relays that do not support this NIP.
-Rationale
---------
-The decision to reserve only single-letter tags to be usable in queries allow applications to make use of tags for all sorts of metadata, as it is their main purpose, without worrying that they might be bloating relay indexes. That also makes relays more lightweight, of course. And if some application or user is abusing single-letter tags with the intention of bloating relays that becomes easier to detect as single-letter tags will hardly be confused with some actually meaningful metadata some application really wanted to attach to the event with no spammy intentions.
-Suggested Use Cases
-------------------
-Motivating examples for generic tag queries are provided below.  This NIP does not promote or standardize the use of any specific tag for any purpose.
-* Decentralized Commenting System: clients can comment on arbitrary web pages, and easily search for other comments, by using a `r` ("reference", in this case an URL) tag and value.
-* Location-specific Posts: clients can use a `g` ("geohash") tag to associate a post with a physical location. Clients can search for a set of geohashes of varying precisions near them to find local content.
-* Hashtags: clients can use simple `t` ("hashtag") tags to associate an event with an easily searchable topic name. Since Nostr events themselves are not searchable through the protocol, this provides a mechanism for user-driven search.
diff --git a/13.md b/13.md
index 360bde6..0178733 100644
--- a/13.md
+++ b/13.md
@@ -110,7 +110,7 @@ function countLeadingZeroes(hex) {
 Querying relays for PoW notes
 -----------------------------
-Since relays allow searching on prefixes, you can use this as a way to filter notes of a certain difficulty:
+If relays allow searching on prefixes, you can use this as a way to filter notes of a certain difficulty:
 ```
 $ echo '["REQ", "subid", {"ids": ["000000000"]}]'  | websocat wss://some-relay.com | jq -c '.[2]'
diff --git a/15.md b/15.md
index f8df328..f9e4b79 100644
--- a/15.md
+++ b/15.md
@@ -4,7 +4,7 @@ NIP-15
 Nostr Marketplace (for resilient marketplaces)
 -----------------------------------
-`draft` `optional` `author:fiatjaf` `author:benarc`  `author:motorina0` `author:talvasconcelos` 
+`draft` `optional` `author:fiatjaf` `author:benarc`  `author:motorina0` `author:talvasconcelos`
 > Based on https://github.com/lnbits/Diagon-Alley
@@ -33,13 +33,13 @@ The `merchant` admin software can be purely clientside, but for `convenience` an
 ## `Merchant` publishing/updating products (event)
 A merchant can publish these events:
-| Kind    |                  | Description                                                                                                   | NIP                                     |
+| Kind      |                    | Description                                                                                                     |
-|---------|------------------|---------------------------------------------------------------------------------------------------------------|-----------------------------------------|
+| --------- | ------------------ | --------------------------------------------------------------------------------------------------------------- |
-| `0    ` | `set_meta`       | The merchant description (similar with any `nostr` public key).                                               | [NIP01       ](https://github.com/nostr-protocol/nips/blob/master/01.md)                            |
+| `0    `   | `set_meta`         | The merchant description (similar with any `nostr` public key).                                                 |
-| `30017` | `set_stall`      | Create or update a stall.                                                                                     | [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md) (Parameterized Replaceable Event) |
+| `30017`   | `set_stall`        | Create or update a stall.                                                                                       |
-| `30018` | `set_product`    | Create or update a product.                                                                                   | [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md) (Parameterized Replaceable Event) |
+| `30018`   | `set_product`      | Create or update a product.                                                                                     |
-| `4    ` | `direct_message` | Communicate with the customer. The messages can be plain-text or JSON. | [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md)                                            |
+| `4    `   | `direct_message`   | Communicate with the customer. The messages can be plain-text or JSON.                                          |
-| `5    ` | `delete`         | Delete a product or a stall.                                                                                  | [NIP09](https://github.com/nostr-protocol/nips/blob/master/09.md)                                   |
+| `5    `   | `delete`           | Delete a product or a stall.                                                                                    |
 ### Event `30017`: Create or update a stall.
@@ -71,7 +71,7 @@ Fields that are not self-explanatory:
 ```json
  "tags": [["d", <String, id of stall]]
 ```
- - the `d` tag is required by [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md). Its value MUST be the same as the stall `id`.
+ - the `d` tag is required, its value MUST be the same as the stall `id`.
 ### Event `30018`: Create or update a product
@@ -109,8 +109,8 @@ _Open_: better to move `spec` in the `tags` section of the event?
    ]
 ```
- - the `d` tag is required by [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md). Its value MUST be the same as the product `id`.
+ - the `d` tag is required, its value MUST be the same as the product `id`.
- - the `t` tag is as searchable tag ([NIP12](https://github.com/nostr-protocol/nips/blob/master/12.md)). It represents different categories that the product can be part of (`food`, `fruits`). Multiple `t` tags can be present.
+ - the `t` tag is as searchable tag, it represents different categories that the product can be part of (`food`, `fruits`). Multiple `t` tags can be present.
 ## Checkout events
@@ -152,7 +152,7 @@ The below json goes in content of [NIP04](https://github.com/nostr-protocol/nips
 ```
 _Open_: is `contact.nostr` required?
-  
 ### Step 2: `merchant` request payment (event)
diff --git a/16.md b/16.md
index 8ef4af4..78ec708 100644
--- a/16.md
+++ b/16.md
@@ -4,37 +4,6 @@ NIP-16
 Event Treatment
 ---------------
-`draft` `optional` `author:Semisol`
+`final` `mandatory` `author:Semisol`
-Relays may decide to allow replaceable and/or ephemeral events.
+Moved to [NIP-01](01.md).
-Regular Events
------------------
-A *regular event* is defined as an event with a kind `1000 <= n < 10000`.
-Upon a regular event being received, the relay SHOULD send it to all clients with a matching filter, and SHOULD store it. New events of the same kind do not affect previous events in any way.
-Replaceable Events
------------------
-A *replaceable event* is defined as an event with a kind `10000 <= n < 20000`.
-Upon a replaceable event with a newer timestamp than the currently known latest replaceable event with the same kind and author being received, the old event SHOULD be discarded,
-effectively replacing what gets returned when querying for
-`author:kind` tuples.
-If two events have the same timestamp, the event with the lowest id (first in lexical order) SHOULD be retained, and the other discarded.
-Ephemeral Events
----------------
-An *ephemeral event* is defined as an event with a kind `20000 <= n < 30000`.
-Upon an ephemeral event being received, the relay SHOULD send it to all clients with a matching filter, and MUST NOT store it.
-Client Behavior
---------------
-Clients SHOULD use the `supported_nips` field to learn if a relay supports this NIP.  Clients SHOULD NOT send ephemeral events to relays that do not support this NIP; they will most likely be persisted.  Clients MAY send replaceable events to relays that may not support this NIP, and clients querying SHOULD be prepared for the relay to send multiple events and should use the latest one.  
-Suggested Use Cases
-------------------
-* States: An application may create a state event that is replaced every time a new state is set (such as statuses)
-* Typing indicators: A chat application may use ephemeral events as a typing indicator.
-* Messaging: Two pubkeys can message over nostr using ephemeral events.
diff --git a/19.md b/19.md
index 6fc4523..6b08742 100644
--- a/19.md
+++ b/19.md
@@ -35,7 +35,7 @@ These are the possible bech32 prefixes with `TLV`:
  - `nprofile`: a nostr profile
  - `nevent`: a nostr event
  - `nrelay`: a nostr relay
-  - `naddr`: a nostr parameterized replaceable event coordinate (NIP-33)
+  - `naddr`: a nostr _parameterized replaceable event_ coordinate
 These possible standardized `TLV` types are indicated here:
diff --git a/20.md b/20.md
index 7e97dd9..ec6127a 100644
--- a/20.md
+++ b/20.md
@@ -1,93 +1,9 @@
 NIP-20
 ======
 Command Results
 ---------------
-`draft` `optional` `author:jb55`
+`final` `mandatory` `author:jb55`
-When submitting events to relays, clients currently have no way to know if an event was successfully committed to the database. This NIP introduces the concept of command results which are like NOTICE's except provide more information about if an event was accepted or rejected.
-A command result is a JSON object with the following structure that is returned when an event is successfully saved to the database or rejected:
-    ["OK", <event_id>, <true|false>, <message>]
-Relays MUST return `true` when the event is a duplicate and has already been saved. The `message` SHOULD start with `duplicate:` in this case.
-Relays MUST return `false` when the event was rejected and not saved.
-The `message` SHOULD provide additional information as to why the command succeeded or failed.
-The `message` SHOULD start with `blocked:` if the pubkey or network address has been blocked, banned, or is not on a whitelist.
-The `message` SHOULD start with `invalid:` if the event is invalid or doesn't meet some specific criteria (created_at is too far off, id is wrong, signature is wrong, etc)
-The `message` SHOULD start with `pow:` if the event doesn't meet some proof-of-work difficulty. The client MAY consult the relay metadata at this point to retrieve the required posting difficulty.
-The `message` SHOULD start with `rate-limited:` if the event was rejected due to rate limiting techniques.
-The `message` SHOULD start with `error:` if the event failed to save due to a server issue.
-Ephemeral events are not acknowledged with OK responses, unless there is a failure.
-If the event or `EVENT` command is malformed and could not be parsed, a NOTICE message SHOULD be used instead of a command result. This NIP only applies to non-malformed EVENT commands.
-Examples
--------
-Event successfully written to the database:
-    ["OK", "b1a649ebe8b435ec71d3784793f3bbf4b93e64e17568a741aecd4c7ddeafce30", true, ""]
-Event successfully written to the database because of a reason:
-    ["OK", "b1a649ebe8b435ec71d3784793f3bbf4b93e64e17568a741aecd4c7ddeafce30", true, "pow: difficulty 25>=24"]
-Event blocked due to ip filter
-    ["OK", "b1a649ebe8...", false, "blocked: tor exit nodes not allowed"]
-Event blocked due to pubkey ban
-    ["OK", "b1a649ebe8...", false, "blocked: you are banned from posting here"]
-Event blocked, pubkey not registered
-    ["OK", "b1a649ebe8...", false, "blocked: please register your pubkey at https://my-expensive-relay.example.com"]
-Event rejected, rate limited
-    ["OK", "b1a649ebe8...", false, "rate-limited: slow down there chief"]
-Event rejected, `created_at` too far off
-    ["OK", "b1a649ebe8...", false, "invalid: event creation date is too far off from the current time. Is your system clock in sync?"]
-Event rejected, insufficient proof-of-work difficulty
-    ["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]
-Event failed to save, 
-    ["OK", "b1a649ebe8...", false, "error: could not connect to the database"]
-Client Handling
---------------
-`messages` are meant for humans, with `reason:` prefixes so that clients can be slightly more intelligent with what to do with them. For example, with a `rate-limited:` reason the client may not show anything and simply try again with a longer timeout.
-For the `pow:` prefix it may query relay metadata to get the updated difficulty requirement and try again in the background.
-For the `invalid:` and `blocked:` prefix the client may wish to show these as styled error popups.
-The prefixes include a colon so that the message can be cleanly separated from the prefix by taking everything after `:` and trimming it.
-Future Extensions
-----------------
-This proposal SHOULD be extended to support further commands in the future, such as REQ and AUTH. They are left out of this initial version to keep things simpler.
+Moved to [NIP-01](01.md).
diff --git a/22.md b/22.md
index 2172519..f595ebf 100644
--- a/22.md
+++ b/22.md
@@ -2,13 +2,13 @@ NIP-22
 ======
 Event `created_at` Limits
---------------------------
+-------------------------
 `draft` `optional` `author:jeffthibault` `author:Giszmo`
 Relays may define both upper and lower limits within which they will consider an event's `created_at` to be acceptable. Both the upper and lower limits MUST be unix timestamps in seconds as defined in [NIP-01](01.md).
-If a relay supports this NIP, the relay SHOULD send the client a [NIP-20](20.md) command result saying the event was not stored for the `created_at` timestamp not being within the permitted limits.
+If a relay supports this NIP, the relay SHOULD send the client an `OK` result saying the event was not stored for the `created_at` timestamp not being within the permitted limits.
 Client Behavior
 ---------------
@@ -22,7 +22,7 @@ This NIP formalizes restrictions on event timestamps as accepted by a relay and
 The event `created_at` field is just a unix timestamp and can be set to a time in the past or future. Relays accept and share events dated to 20 years ago or 50,000 years in the future. This NIP aims to define a way for relays that do not want to store events with *any* timestamp to set their own restrictions.
-[Replaceable events](16.md#replaceable-events) can behave rather unexpectedly if the user wrote them - or tried to write them - with a wrong system clock. Persisting an update with a backdated system now would result in the update not getting persisted without a notification and if they did the last update with a forward dated system, they will again fail to do another update with the now correct time.
+_Replaceable events_ can behave rather unexpectedly if the user wrote them - or tried to write them - with a wrong system clock. Persisting an update with a backdated system now would result in the update not getting persisted without a notification and if they did the last update with a forward dated system, they will again fail to do another update with the now correct time.
 A wide adoption of this NIP could create a better user experience as it would decrease the amount of events that appear wildly out of order or even from impossible dates in the distant past or future.
diff --git a/23.md b/23.md
index 7a06b0e..76c0a69 100644
--- a/23.md
+++ b/23.md
@@ -6,7 +6,7 @@ Long-form Content
 `draft` `optional` `author:fiatjaf`
-This NIP defines `kind:30023` (a parameterized replaceable event according to [NIP-33](33.md)) for long-form text content, generally referred to as "articles" or "blog posts". `kind:30024` has the same structure as `kind:30023` and is used to save long form drafts.
+This NIP defines `kind:30023` (a _parameterized replaceable event_) for long-form text content, generally referred to as "articles" or "blog posts". `kind:30024` has the same structure as `kind:30023` and is used to save long form drafts.
 "Social" clients that deal primarily with `kind:1` notes should not be expected to implement this NIP.
@@ -20,7 +20,7 @@ The `.content` of these events should be a string text in Markdown syntax. To ma
 ### Metadata
-For the date of the last update the `.created_at` field should be used, for "tags"/"hashtags" (i.e. topics about which the event might be of relevance) the `"t"` event tag should be used, as per NIP-12.
+For the date of the last update the `.created_at` field should be used, for "tags"/"hashtags" (i.e. topics about which the event might be of relevance) the `t` tag should be used, as per NIP-12.
 Other metadata fields can be added as tags to the event as necessary. Here we standardize 4 that may be useful, although they remain strictly optional:
@@ -31,11 +31,11 @@ Other metadata fields can be added as tags to the event as necessary. Here we st
 ### Editability
-These articles are meant to be editable, so they should make use of the replaceability feature of NIP-33 and include a `"d"` tag with an identifier for the article. Clients should take care to only publish and read these events from relays that implement that. If they don't do that they should also take care to hide old versions of the same article they may receive.
+These articles are meant to be editable, so they should make use of the parameterized replaceability feature and include a `d` tag with an identifier for the article. Clients should take care to only publish and read these events from relays that implement that. If they don't do that they should also take care to hide old versions of the same article they may receive.
 ### Linking
-The article may be linked to using the NIP-19 `naddr` code along with the `"a"` tag (see [NIP-33](33.md) and [NIP-19](19.md)).
+The article may be linked to using the [NIP-19](19.md) `naddr` code along with the `a` tag.
 ### References
diff --git a/33.md b/33.md
index 5128bec..1e7a9fc 100644
--- a/33.md
+++ b/33.md
@@ -4,52 +4,6 @@ NIP-33
 Parameterized Replaceable Events
 --------------------------------
-`draft` `optional` `author:Semisol` `author:Kukks` `author:Cameri` `author:Giszmo`
+`final` `mandatory` `author:Semisol` `author:Kukks` `author:Cameri` `author:Giszmo`
-This NIP adds a new event range that allows for replacement of events that have the same `d` tag and kind unlike NIP-16 which only replaced by kind.
+Moved to [NIP-01](01.md).
-Implementation
--------------
-The value of a tag can be any string and is defined as the first parameter of a tag after the tag name.
-A *parameterized replaceable event* is defined as an event with a kind `30000 <= n < 40000`.
-Upon a parameterized replaceable event with a newer timestamp than the currently known latest
-replaceable event with the same kind, author and first `d` tag value being received, the old event
-SHOULD be discarded, effectively replacing what gets returned when querying for
-`author:kind:d-tag` tuples.
-If two events have the same timestamp, the event with the lowest id (first in lexical order) SHOULD be retained, and the other discarded.
-A missing or a `d` tag with no value should be interpreted equivalent to a `d` tag with the
-value as an empty string. Events from the same author with any of the following `tags`
-replace each other:
-* `"tags":[["d",""]]`
-* `"tags":[]`: implicit `d` tag with empty value
-* `"tags":[["d"]]`: implicit empty value `""`
-* `"tags":[["d",""],["d","not empty"]]`: only first `d` tag is considered
-* `"tags":[["d"],["d","some value"]]`: only first `d` tag is considered
-* `"tags":[["e"]]`: same as no tags
-* `"tags":[["d","","1"]]`: only the first value is considered (`""`)
-Clients SHOULD NOT use `d` tags with multiple values and SHOULD include the `d` tag even if it has no value to allow querying using the `#d` filter.
-Referencing and tagging
-----------------------
-Normally (as per NIP-01, NIP-12) the `"p"` tag is used for referencing public keys and the
-`"e"` tag for referencing event ids and the `note`, `npub`, `nprofile` or `nevent` are their
-equivalents for event tags (i.e. an `nprofile` is generally translated into a tag
-`["p", "<event hex id>", "<relay url>"]`).
-To support linking to parameterized replaceable events, the `naddr` code is introduced on
-NIP-19. It includes the public key of the event author and the `d` tag (and relays) such that
-the referenced combination of public key and `d` tag can be found.
-The equivalent in `tags` to the `naddr` code is the tag `"a"`, comprised of `["a", "<kind>:<pubkey>:<d-identifier>", "<relay url>"]`.
-Client Behavior
---------------
-Clients SHOULD use the `supported_nips` field to learn if a relay supports this NIP.
-Clients MAY send parameterized replaceable events to relays that may not support this NIP, and clients querying SHOULD be prepared for the relay to send multiple events and should use the latest one and are recommended to send a `#d` tag filter. Clients should account for the fact that missing `d` tags or ones with no value are not returned in tag filters, and are recommended to always include a `d` tag with a value.
diff --git a/51.md b/51.md
index 80cc09e..b7229aa 100644
--- a/51.md
+++ b/51.md
@@ -2,15 +2,13 @@ NIP-51
 ======
 Lists
-------------------------
+-----
-`draft` `optional` `author:fiatjaf` `author:arcbtc` `author:monlovesmango` `author:eskema` `depends:33`
+`draft` `optional` `author:fiatjaf` `author:arcbtc` `author:monlovesmango` `author:eskema`
 A "list" event is defined as having a list of public and/or private tags. Public tags will be listed in the event `tags`. Private tags will be encrypted in the event `content`. Encryption for private tags will use [NIP-04 - Encrypted Direct Message](04.md) encryption, using the list author's private and public key for the shared secret. A distinct event kind should be used for each list type created.
-If a list type should only be defined once per user (like the 'Mute' list), the list type's events should follow the specification for [NIP-16 - Replaceable Events](16.md). These lists may be referred to as 'replaceable lists'.
+If a list should only be defined once per user (like the "mute" list) the list is declared as a _replaceable event_. These lists may be referred to as "replaceable lists". Otherwise, the list is a _parameterized replaceable event_ and the list name will be used as the `d` tag. These lists may be referred to as "parameterized replaceable lists".
-Otherwise, the list type's events should follow the specification for [NIP-33 - Parameterized Replaceable Events](33.md), where the list name will be used as the 'd' parameter. These lists may be referred to as 'parameterized replaceable lists'.
 ## Replaceable List Event Example
diff --git a/52.md b/52.md
index c601412..846fbf4 100644
--- a/52.md
+++ b/52.md
@@ -6,7 +6,7 @@ Calendar Events
 `draft` `optional` `author:tyiu`
-This specification defines calendar events representing an occurrence at a specific moment or between moments. These calendar events are replaceable and referenceable per [NIP-33](33.md) and deletable per [NIP-09](09.md).
+This specification defines calendar events representing an occurrence at a specific moment or between moments. These calendar events are _parameterized replaceable_ and deletable per [NIP-09](09.md).
 Unlike the term `calendar event` specific to this NIP, the term `event` is used broadly in all the NIPs to describe any Nostr event. The distinction is being made here to discern between the two terms.
@@ -139,7 +139,7 @@ A calendar is a collection of calendar events, represented as a custom replaceab
 The format uses a custom replaceable list of kind `31924` with a list of tags as described below:
 * `d` (required) calendar name
-* `a` (repeated) reference tag to kind `31922` or `31923` calendar event being responded to per [NIP-33](33.md)
+* `a` (repeated) reference tag to kind `31922` or `31923` calendar event being responded to
 ```json
 {
@@ -171,7 +171,7 @@ The format uses a parameterized replaceable event kind `31925`.
 The `.content` of these events is optional and should be a free-form note that adds more context to this calendar event response.
 The list of tags are as follows:
-* `a` (required) reference tag to kind `31922` or `31923` calendar event being responded to per [NIP-33](33.md)
+* `a` (required) reference tag to kind `31922` or `31923` calendar event being responded to.
 * `d` (required) universally unique identifier. Generated by the client creating the calendar event RSVP.
 * `L` (required) label namespace of `status` per [NIP-32](32.md)
 * `l` (required) label of `accepted`, `declined`, or `tentative` under the label namespace of `status` per [NIP-32](32.md). Determines attendance status to the referenced calendar event.
diff --git a/53.md b/53.md
index c5f2704..b3d416b 100644
--- a/53.md
+++ b/53.md
@@ -12,7 +12,7 @@ Service providers want to offer live activities to the Nostr network in such a w
 # Live Event
-A special event with `kind:30311` "Live Event" is defined as a [NIP-33: Parameterized Replaceable Events](33.md) of public `p` tags. Each `p` tag SHOULD have a **displayable** marker name for the current role (e.g. `Host`, `Speaker`, `Participant`) of the user in the event and the relay information MAY be empty. This event will be constantly updated as participants join and leave the activity.
+A special event with `kind:30311` "Live Event" is defined as a _parameterized replaceable event_ of public `p` tags. Each `p` tag SHOULD have a **displayable** marker name for the current role (e.g. `Host`, `Speaker`, `Participant`) of the user in the event and the relay information MAY be empty. This event will be constantly updated as participants join and leave the activity.
 For example:
@@ -44,13 +44,13 @@ For example:
 A distinct `d` tag should be used for each activity. All other tags are optional.
-Providers SHOULD keep the participant list small (e.g. under 1000 users) and, when limits are reached, Providers SHOULD select which participants get named in the event. Clients should not expect a comprehensive list. Once the activity ends, the event can be deleted or updated to summarize the activity and provide async content (e.g. recording of the event). 
+Providers SHOULD keep the participant list small (e.g. under 1000 users) and, when limits are reached, Providers SHOULD select which participants get named in the event. Clients should not expect a comprehensive list. Once the activity ends, the event can be deleted or updated to summarize the activity and provide async content (e.g. recording of the event).
-Clients are expected to subscribe to `kind:30311` events in general or for given follow lists and statuses. Clients MAY display participants' roles in activities as well as access points to join the activity. 
+Clients are expected to subscribe to `kind:30311` events in general or for given follow lists and statuses. Clients MAY display participants' roles in activities as well as access points to join the activity.
 Live Activity management clients are expected to constantly update `kind:30311` during the event. Clients MAY choose to consider `status=live` events after 1hr without any update as `ended`. The `starts` and `ends` timestamp SHOULD be updated when the status changes to and from `live`
-The activity MUST be linked to using the NIP-19 naddr code along with the "a" tag (see [NIP-33](33.md) and [NIP-19](19.md)).
+The activity MUST be linked to using the [NIP-19](19.md) `naddr` code along with the `a` tag.
 ## Proof of Agreement to Participate
@@ -58,11 +58,11 @@ Event owners can add proof as the 5th term in each `p` tag to clarify the partic
 Clients MAY only display participants if the proof is available or MAY display participants as "invited" if the proof is not available.
-This feature is important to avoid malicious event owners adding large account holders to the event, without their knowledge, to lure their followers into the malicious owner's trap.  
+This feature is important to avoid malicious event owners adding large account holders to the event, without their knowledge, to lure their followers into the malicious owner's trap.
 # Live Chat Message
-Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used. 
+Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used.
 ```js
 {
@@ -74,7 +74,7 @@ Event `kind:1311` is live chat's channel message. Clients MUST include the `a` t
    ["a", "30311:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>", "root"],
  ],
  "content": "Zaps to live streams is beautiful."
-} 
+}
 ```
 # Use Cases
@@ -83,7 +83,7 @@ Common use cases include meeting rooms/workshops, watch-together activities, or
 # Example
-Live Streaming 
+Live Streaming
 ```json
 {
@@ -112,7 +112,7 @@ Live Streaming chat message
 ```json
 {
  "id": "97aa81798ee6c5637f7b21a411f89e10244e195aa91cb341bf49f718e36c8188",
-  "pubkey": "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24", 
+  "pubkey": "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24",
  "created_at": 1687286726,
  "kind": 1311,
  "tags": [
@@ -122,4 +122,3 @@ Live Streaming chat message
  "sig": "997f62ddfc0827c121043074d50cfce7a528e978c575722748629a4137c45b75bdbc84170bedc723ef0a5a4c3daebf1fef2e93f5e2ddb98e5d685d022c30b622"
 }
 ````
diff --git a/58.md b/58.md
index 2fa4406..d6bb27d 100644
--- a/58.md
+++ b/58.md
@@ -9,15 +9,9 @@ Badges
 Three special events are used to define, award and display badges in
 user profiles:
-1. A "Badge Definition" event is defined as a parameterized replaceable event
+1. A "Badge Definition" event is defined as a parameterized replaceable event with kind `30009` having a `d` tag with a value that uniquely identifies the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can be updated.
-with kind `30009` having a `d` tag with a value that uniquely identifies
-the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can
+2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing a "Define Badge" event and one or more `p` tags, one for each pubkey the badge issuer wishes to award. Awarded badges are immutable and non-transferrable.
-be updated.
-2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing
-a "Define Badge" event and one or more `p` tags, one for each pubkey the
-badge issuer wishes to award. The value for the `a` tag MUST follow the format
-defined in [NIP-33](33.md). Awarded badges are immutable and non-transferrable.
 3. A "Profile Badges" event is defined as a parameterized replaceable event
 with kind `30008` with a `d` tag with the value `profile_badges`.
diff --git a/72.md b/72.md
index f4bebf4..599a4c4 100644
--- a/72.md
+++ b/72.md
@@ -6,7 +6,7 @@ Moderated Communities (Reddit Style)
 `draft` `optional` `author:vitorpamplona` `author:arthurfranca`
-The goal of this NIP is to create moderator-approved public communities around a topic. It defines the replaceable event `kind:34550` to define the community and the current list of moderators/administrators. Users that want to post into the community, simply tag any Nostr event with the community's `a` tag (See [NIP-33](33.md)). Moderators issue an approval event `kind:4550` that links the community with the new post.
+The goal of this NIP is to create moderator-approved public communities around a topic. It defines the replaceable event `kind:34550` to define the community and the current list of moderators/administrators. Users that want to post into the community, simply tag any Nostr event with the community's `a` tag. Moderators issue an approval event `kind:4550` that links the community with the new post.
 # Community Definition
diff --git a/README.md b/README.md
index 3c35ef3..f2603cf 100644
--- a/README.md
+++ b/README.md
@@ -30,14 +30,11 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-09: Event Deletion](09.md)
 - [NIP-10: Conventions for clients' use of `e` and `p` tags in text events](10.md)
 - [NIP-11: Relay Information Document](11.md)
- [NIP-12: Generic Tag Queries](12.md)
 - [NIP-13: Proof of Work](13.md)
 - [NIP-14: Subject tag in text events](14.md)
 - [NIP-15: Nostr Marketplace (for resilient marketplaces)](15.md)
- [NIP-16: Event Treatment](16.md)
 - [NIP-18: Reposts](18.md)
 - [NIP-19: bech32-encoded entities](19.md)
- [NIP-20: Command Results](20.md)
 - [NIP-21: `nostr:` URI scheme](21.md)
 - [NIP-22: Event `created_at` Limits](22.md)
 - [NIP-23: Long-form Content](23.md)
@@ -48,7 +45,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)
- [NIP-33: Parameterized Replaceable Events](33.md)
 - [NIP-36: Sensitive Content](36.md)
 - [NIP-39: External Identities in Profiles](39.md)
 - [NIP-40: Expiration Timestamp](40.md)
@@ -78,7 +74,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | ------- | -------------------------- | ----------- |
 | `0`     | Metadata                   | [1](01.md)  |
 | `1`     | Short Text Note            | [1](01.md)  |
-| `2`     | Recommend Relay            | [1](01.md)  |
+| `2`     | Recommend Relay            |             |
 | `3`     | Contacts                   | [2](02.md)  |
 | `4`     | Encrypted Direct Messages  | [4](04.md)  |
 | `5`     | Event Deletion             | [9](09.md)  |
@@ -128,59 +124,48 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `34550` | Community Definition       | [72](72.md) |
-### Event Kind Ranges
-| range            | description                      | NIP         |
-| ---------------- | -------------------------------- | ----------- |
-| `1000`--`9999`   | Regular Events                   | [16](16.md) |
-| `10000`--`19999` | Replaceable Events               | [16](16.md) |
-| `20000`--`29999` | Ephemeral Events                 | [16](16.md) |
-| `30000`--`39999` | Parameterized Replaceable Events | [33](33.md) |
 ## Message types
 ### Client to Relay
 | type    | description                                         | NIP         |
 | ------- | --------------------------------------------------- | ----------- |
+| `EVENT` | used to publish events                              | [01](01.md) |
+| `REQ`   | used to request events and subscribe to new updates | [01](01.md) |
+| `CLOSE` | used to stop previous subscriptions                 | [01](01.md) |
 | `AUTH`  | used to send authentication events                  | [42](42.md) |
-| `CLOSE` | used to stop previous subscriptions                 | [1](01.md)  |
 | `COUNT` | used to request event counts                        | [45](45.md) |
-| `EVENT` | used to publish events                              | [1](01.md)  |
-| `REQ`   | used to request events and subscribe to new updates | [1](01.md)  |
 ### Relay to Client
 | type     | description                                             | NIP         |
 | -------- | ------------------------------------------------------- | ----------- |
+| `EOSE`   | used to notify clients all stored events have been sent | [01](01.md) |
+| `EVENT`  | used to send events requested to clients                | [01](01.md) |
+| `NOTICE` | used to send human-readable messages to clients         | [01](01.md) |
+| `OK`     | used to notify clients if an EVENT was successful       | [01](01.md) |
 | `AUTH`   | used to send authentication challenges                  | [42](42.md) |
 | `COUNT`  | used to send requested event counts to clients          | [45](45.md) |
-| `EOSE`   | used to notify clients all stored events have been sent | [1](01.md)  |
-| `EVENT`  | used to send events requested to clients                | [1](01.md)  |
-| `NOTICE` | used to send human-readable messages to clients         | [1](01.md)  |
-| `OK`     | used to notify clients if an EVENT was successful       | [20](20.md) |
 Please update these lists when proposing NIPs introducing new event kinds.
-When experimenting with kinds, keep in mind the classification introduced by [NIP-16](16.md) and [NIP-33](33.md).
 ## Standardized Tags
 | name              | value                                | other parameters     | NIP                      |
 | ----------------- | ------------------------------------ | -------------------- | ------------------------ |
-| `a`               | coordinates to an event              | relay URL            | [33](33.md), [23](23.md) |
+| `e`               | event id (hex)                       | relay URL, marker    | [01](01.md), [10](10.md) |
+| `p`               | pubkey (hex)                         | relay URL, petname   | [01](01.md), [02](02.md) |
+| `a`               | coordinates to an event              | relay URL            | [01](01.md)              |
+| `d`               | identifier                           | --                   | [01](01.md)              |
 | `alt`             | Alt tag                              | --                   | [31](31.md)              |
-| `d`               | identifier                           | --                   | [33](33.md)              |
+| `g`               | geohash                              | --                   | [52](52.md)              |
-| `e`               | event id (hex)                       | relay URL, marker    | [1](01.md), [10](10.md)  |
-| `g`               | geohash                              | --                   | [12](12.md), [52](52.md) |
 | `i`               | identity                             | proof                | [39](39.md)              |
 | `k`               | kind number (string)                 | --                   | [18](18.md), [72](72.md) |
 | `l`               | label, label namespace               | annotations          | [32](32.md)              |
 | `L`               | label namespace                      | --                   | [32](32.md)              |
-| `p`               | pubkey (hex)                         | relay URL            | [1](01.md)               |
+| `r`               | a reference (URL, etc)               | --                   |                          |
-| `r`               | a reference (URL, etc)               | --                   | [12](12.md)              |
+| `t`               | hashtag                              | --                   |                          |
-| `t`               | hashtag                              | --                   | [12](12.md)              |
+| `amount`          | millisatoshis, stringified           | --                   | [57](57.md)              |
-| `amount`          | millisats                            | --                   | [57](57.md)              |
 | `bolt11`          | `bolt11` invoice                     | --                   | [57](57.md)              |
 | `challenge`       | challenge string                     | --                   | [42](42.md)              |
 | `content-warning` | reason                               | --                   | [36](36.md)              |