Merge branch 'master' into vending-machine

2024-11-13 23:39:08 -05:00 · 2023-10-15 21:30:42 +03:00 · 2023-10-15 21:30:42 +03:00 · a482f47ae4
commit a482f47ae4
parent d9400e1e7b 202e18f2b2
32 changed files with 593 additions and 467 deletions
--- 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,14 +19,13 @@ 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>
+  "sig": <64-bytes lowercase hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
 }
 ```
@ -35,7 +34,7 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 ```json
 [
  0,
-  <pubkey, as a (lowercase) hex string>,
+  <pubkey, as a lowercase hex string>,
  <created_at, as a number>,
  <kind, as a number>,
  <tags, as an array of arrays of non-null strings>,
@ -43,9 +42,63 @@ 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 across all event kinds with the same meaning. They are as follows:
 - The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>]`
 - The `p` tag, used to refer to another user: `["p", <32-bytes lowercase hex of a pubkey>, <recommended relay URL, optional>]`
 - The `a` tag, used to refer to a (maybe parameterized) replaceable event
    - for a parameterized replaceable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:<d tag value>, <recommended relay URL, optional>]`
    - for a non-parameterized replaceable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:, <recommended relay URL, optional>]`
 As a convention, all single-letter (only english alphabet letters: a-z, A-Z) 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 || n == 0 || n == 3`, events are **replaceable**, which means that, for each combination of `pubkey` and `kind`, only the latest event MUST be stored by relays, older versions MAY 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's first value, only the latest event MUST be stored by relays, older versions MAY be discarded.
 In case of replaceable events with the same timestamp, the event with the lowest id (first in lexical order) should be retained, and the other discarded.
 When answering to `REQ` messages for replaceable events such as `{"kinds":[0],"authors":[<hex-key>]}`, even if the relay has more than one version stored, it SHOULD return just the latest one.
 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. Relays MAY limit number of connections from specific IP/client/etc.
 ### 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,22 +114,21 @@ 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-zA-Z)>": <a list of tag values, for #e — a list of event ids, for #p — a list of event pubkeys etc>,
  "#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>
+  "limit": <maximum number of events relays SHOULD return in the initial query>
 }
 ```
-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.
+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 relay MUST 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 +136,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, ""]`
-
+  * `["OK", "b1a649ebe8...", true, "pow: difficulty 25>=24"]`
-  - `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, "duplicate: already have this event"]`
-  - `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...", false, "blocked: you are banned from posting here"]`
-  - `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: please register your pubkey at https://my-expensive-relay.example.com"]`
-
+  * `["OK", "b1a649ebe8...", false, "rate-limited: slow down there chief"]`
-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, "invalid: event creation date is too far off from the current time. Is your system clock in sync?"]`
-
+  * `["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]`
-## Other Notes:
+  * `["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.
--- a/03.md
+++ b/03.md
@ -4,20 +4,33 @@ NIP-03
 OpenTimestamps Attestations for Events
 --------------------------------------
-`draft` `optional` `author:fiatjaf`
+`draft` `optional` `author:fiatjaf` `author:constant`
-When there is an OTS available it MAY be included in the existing event body under the `ots` key:
+This NIP defines an event with `kind:1040` that can contain an [OpenTimestamps](https://opentimestamps.org/) proof for any other event:
-```
+```json
 {
-  "id": ...,
+  "kind": 1040
-  "kind": ...,
+  "tags": [
-  ...,
+    ["e", <event-id>, <relay-url>],
-  ...,
+    ["block", <block-height-as-string>, <block-hash>],
-  "ots": <base64-encoded OTS file data>
+    ["alt", "opentimestamps attestation"]
  ],
  "content": <base64-encoded OTS file data>
 }
 ```
-The _event id_ MUST be used as the raw hash to be included in the OpenTimestamps merkle tree.
+- The OpenTimestamps proof MUST prove the referenced `e` event id as its digest.
 - The `block` tag is optional, it exists to establish a minimum date since which the given event has existed.
 - The `content` MUST be the full content of an `.ots` file containing at least one Bitcoin attestation. This file SHOULD contain a **single** Bitcoin attestation and no reference to "pending" attestations since they are useless in this context.
-The attestation can be either provided by relays automatically (and the OTS binary contents just appended to the events it receives) or by clients themselves when they first upload the event to relays — and used by clients to show that an event is really "at least as old as [OTS date]".
+### Example OpenTimestamps proof verification flow
 Using [`nak`](https://github.com/fiatjaf/nak), [`jq`](https://jqlang.github.io/jq/) and [`ots`](https://github.com/fiatjaf/ots):
 ```bash
 ~> nak req -i e71c6ea722987debdb60f81f9ea4f604b5ac0664120dd64fb9d23abc4ec7c323 wss://nostr-pub.wellorder.net | jq -r .content | ots verify
 > using an esplora server at https://blockstream.info/api
 - sequence ending on block 810391 is valid
 timestamp validated at block [810391]
 ```
--- a/05.md
+++ b/05.md
@ -6,11 +6,11 @@ Mapping Nostr keys to DNS-based internet identifiers
 `final` `optional` `author:fiatjaf` `author:mikedilger`
-On events of kind `0` (`set_metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
+On events of kind `0` (`metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
 Upon seeing that, the client splits the identifier into `<local-part>` and `<domain>` and use these values to make a GET request to `https://<domain>/.well-known/nostr.json?name=<local-part>`.
-The result should be a JSON document object with a key `"names"` that should then be a mapping of names to hex formatted public keys. If the public key for the given `<name>` matches the `pubkey` from the `set_metadata` event, the client then concludes that the given pubkey can indeed be referenced by its identifier.
+The result should be a JSON document object with a key `"names"` that should then be a mapping of names to hex formatted public keys. If the public key for the given `<name>` matches the `pubkey` from the `metadata` event, the client then concludes that the given pubkey can indeed be referenced by its identifier.
 ### Example
--- a/06.md
+++ b/06.md
@ -13,3 +13,19 @@ Basic key derivation from mnemonic seed phrase
 A basic client can simply use an `account` of `0` to derive a single key. For more advanced use-cases you can increment `account`, allowing generation of practically infinite keys from the 5-level path with hardened derivation.
 Other types of clients can still get fancy and use other derivation paths for their own other purposes.
 ### Test vectors
 mnemonic: leader monkey parrot ring guide accident before fence cannon height naive bean\
 private key (hex): 7f7ff03d123792d6ac594bfa67bf6d0c0ab55b6b1fdb6249303fe861f1ccba9a\
 nsec: nsec10allq0gjx7fddtzef0ax00mdps9t2kmtrldkyjfs8l5xruwvh2dq0lhhkp\
 public key (hex): 17162c921dc4d2518f9a101db33695df1afb56ab82f5ff3e5da6eec3ca5cd917\
 npub: npub1zutzeysacnf9rru6zqwmxd54mud0k44tst6l70ja5mhv8jjumytsd2x7nu
 ---
 mnemonic: what bleak badge arrange retreat wolf trade produce cricket blur garlic valid proud rude strong choose busy staff weather area salt hollow arm fade\
 private key (hex): c15d739894c81a2fcfd3a2df85a0d2c0dbc47a280d092799f144d73d7ae78add\
 nsec: nsec1c9wh8xy5eqdzln7n5t0ctgxjcrdug73gp5yj0x03gntn67h83twssdfhel\
 public key (hex): d41b22899549e1f3d335a31002cfd382174006e166d3e658e3a5eecdb6463573\
 npub: npub16sdj9zv4f8sl85e45vgq9n7nsgt5qphpvmf7vk8r5hhvmdjxx4es8rq74h
--- a/07.md
+++ b/07.md
@ -33,3 +33,4 @@ async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext
 - [AKA Profiles](https://github.com/neilck/aka-extension) (Chrome, stores multiple keys)
 - [TokenPocket](https://www.tokenpocket.pro/) (Android, IOS, Chrome and derivatives)
 - [Nostrmo](https://github.com/haorendashu/nostrmo_faq#download) (Android, IOS)
 - [Spring Browser](https://spring.site) (Android)
--- a/10.md
+++ b/10.md
@ -46,7 +46,7 @@ Where:
 * `<relay-url>` is the URL of a recommended relay associated with the reference. Clients SHOULD add a valid `<relay-URL>` field, but may instead leave it as `""`.
 * `<marker>` is optional and if present is one of `"reply"`, `"root"`, or `"mention"`.
-**The order of marked "e" tags is not relevant.**  Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.
+Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.
 A direct reply to the root of a thread should have a single marked "e" tag of type "root".
--- a/11.md
+++ b/11.md
@ -75,12 +75,13 @@ are rejected or fail immediately.
        "max_filters": 100,
        "max_limit": 5000,
        "max_subid_length": 100,
        "min_prefix": 4,
        "max_event_tags": 100,
        "max_content_length": 8196,
        "min_pow_difficulty": 30,
        "auth_required": true,
        "payment_required": true,
        "created_at_lower_limit":31536000,
        "created_at_upper_limit":3,
  }
 ...
 }
@ -102,9 +103,6 @@ Must be one or higher.
 - `max_subid_length`: maximum length of subscription id as a string.
 - `min_prefix`: for `authors` and `ids` filters which are to match against
 a hex prefix, you must provide at least this many hex digits in the prefix.
 - `max_limit`: the relay server will clamp each filter's `limit` value to this number.
 This means the client won't be able to get more than this number
 of events from a single subscription filter. This clamping is typically done silently
@ -127,6 +125,10 @@ Even if set to False, authentication may be required for specific actions.
 - `payment_required`: this relay requires payment before a new connection may perform any action.
 - `created_at_lower_limit`: 'created_at' lower limit as defined in [NIP-22](22.md)
 - `created_at_upper_limit`: 'created_at' upper limit as defined in [NIP-22](22.md)
 ### Event Retention ###
 There may be a cost associated with storing data forever, so relays
@ -161,8 +163,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 ###
@ -285,7 +286,6 @@ As of 2 May 2023 the following `curl` command provided these results.
 				  "max_filters":2500,
 				  "max_limit":5000,
 				  "max_subid_length":256,
 				  "min_prefix":4,
 				  "max_event_tags":2500,
 				  "max_content_length":65536,
 				  "min_pow_difficulty":0,
--- 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.
--- 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]'
--- a/15.md
+++ b/15.md
@ -8,7 +8,7 @@ Nostr Marketplace (for resilient marketplaces)
 > Based on https://github.com/lnbits/Diagon-Alley
-> Implemented here https://github.com/lnbits/nostrmarket
+> Implemented in [NostrMarket](https://github.com/lnbits/nostrmarket) and [Plebeian Market](https://github.com/PlebeianTech/plebeian-market) 
 ## Terms
@ -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.
@ -54,8 +54,8 @@ A merchant can publish these events:
        {
            "id": <String, UUID of the shipping zone, generated by the merchant>,
            "name": <String (optional), zone name>,
-            "cost": <float, cost for shipping. The currency is defined at the stall level>,
+            "cost": <float, base cost for shipping. The currency is defined at the stall level>,
-            "countries": [<String, countries included in this zone>],
+            "regions": [<String, regions included in this zone>],
        }
    ]
 }
@ -63,15 +63,18 @@ A merchant can publish these events:
 Fields that are not self-explanatory:
 - `shipping`:
-   - an array with possible shipping zones for this stall. The customer MUST choose exactly one shipping zone.
+   - an array with possible shipping zones for this stall.
   - the customer MUST choose exactly one of those shipping zones.
   - shipping to different zones can have different costs. For some goods (digital for example) the cost can be zero.
   - the `id` is an internal value used by the merchant. This value must be sent back as the customer selection.
   - each shipping zone contains the base cost for orders made to that shipping zone, but a specific shipping cost per
   product can also be specified if the shipping cost for that product is higher than what's specified by the base cost.
 **Event Tags**:
 ```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
@ -87,17 +90,30 @@ Fields that are not self-explanatory:
    "price": <float, cost of product>,
    "quantity": <int, available items>,
    "specs": [
-      [ <String, spec key>, <String, spec value>]
+        [<String, spec key>, <String, spec value>]
    ],
    "shipping": [
        {
            "id": <String, UUID of the shipping zone. Must match one of the zones defined for the stall>,
            "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
        }
    ]
 }
 ```
 Fields that are not self-explanatory:
 - `specs`:
-   - an array of key pair values. It allows for the Customer UI to present present product specifications in a structure mode. It also allows comparison between products
+   - an optional array of key pair values. It allows for the Customer UI to present product specifications in a structure mode. It also allows comparison between products
   - eg: `[["operating_system", "Android 12.0"], ["screen_size", "6.4 inches"], ["connector_type", "USB Type C"]]`
-_Open_: better to move `spec` in the `tags` section of the event?
+    _Open_: better to move `spec` in the `tags` section of the event?
 - `shipping`:
   - an _optional_ array of extra costs to be used per shipping zone, only for products that require special shipping costs to be added to the base shipping cost defined in the stall
   - the `id` should match the id of the shipping zone, as defined in the `shipping` field of the stall
   - to calculate the total cost of shipping for an order, the user will choose a shipping option during checkout, and then the client must consider this costs:
     - the `base cost from the stall` for the chosen shipping option
     - the result of multiplying the product units by the `shipping costs specified in the product`, if any. 
 **Event Tags**:
 ```json
@ -109,8 +125,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
@ -204,6 +220,28 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
    "shipped": <Bool, true/false has been shipped>,
 }
 ```
 ## Customize Marketplace
 Create a customized user experience using the `naddr` from [NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md#shareable-identifiers-with-extra-metadata). The use of `naddr` enables easy sharing of marketplace events while incorporating a rich set of metadata. This metadata can include relays, merchant profiles, and more. Subsequently, it allows merchants to be grouped into a market, empowering the market creator to configure the marketplace's user interface and user experience, and share that marketplace. This customization can encompass elements such as market name, description, logo, banner, themes, and even color schemes, offering a tailored and unique marketplace experience.
 ### Event `30019`: Create or update marketplace UI/UX
 **Event Content**:
 ```json
 {
    "name": <String (optional), market name>,
    "about": <String (optional), market description>,
    "ui": {
      "picture": <String (optional), market logo image URL>,
      "banner": <String (optional), market logo banner URL>,
      "theme": <String (optional), market theme>,
      "darkMode": <Bool, true/false>
    },
    "merchants": <[String] (optional), array of pubkeys>,
    ...
 }
 ```
 This event leverages naddr to enable comprehensive customization and sharing of marketplace configurations, fostering a unique and engaging marketplace environment.
 ## Customer support events
@ -211,4 +249,4 @@ Customer support is handled over whatever communication method was specified. If
 ## Additional
-Standard data models can be found here <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>
+Standard data models can be found <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>
--- 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.
--- 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 _replaceable event_ coordinate
 These possible standardized `TLV` types are indicated here:
@ -44,7 +44,7 @@ These possible standardized `TLV` types are indicated here:
    - for `nprofile` it will be the 32 bytes of the profile public key
    - for `nevent` it will be the 32 bytes of the event id
    - for `nrelay`, this is the relay URL
-    - for `naddr`, it is the identifier (the `"d"` tag) of the event being referenced
+    - for `naddr`, it is the identifier (the `"d"` tag) of the event being referenced. For non-parameterized replaceable events, use an empty string.
 - `1`: `relay`
  - for `nprofile`, `nevent` and `naddr`, _optionally_, a relay in which the entity (profile or event) is more likely to be found, encoded as ascii
  - this may be included multiple times
--- 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.
+Moved to [NIP-01](01.md).
 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.
--- 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.
--- 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
--- a/24.md
+++ b/24.md
@ -0,0 +1,41 @@
 NIP-24
 ======
 Extra metadata fields and tags
 ------------------------------
 `draft` `optional` `author:fiatjaf`
 This NIP defines extra optional fields added to events.
 kind 0
 ======
 These are extra fields not specified in NIP-01 that may be present in the stringified JSON of metadata events:
  - `display_name`: a bigger name with richer characters than `name`. Implementations should fallback to `name` when this is not available.
  - `website`: a web URL related in any way to the event author.
  - `banner`: an URL to a wide (~1024x768) picture to be optionally displayed in the background of a profile screen.
 ### Deprecated fields
 These are fields that should be ignored or removed when found in the wild:
  - `displayName`: use `display_name` instead.
  - `username`: use `name` instead.
 kind 3
 ======
 These are extra fields not specified in NIP-02 that may be present in the stringified JSON of contacts events:
 ### Deprecated fields
  - `{<relay-url>: {"read": <true|false>, "write": <true|false>}, ...}`: an object of relays used by a user to read/write. [NIP-65](65.md) should be used instead.
 tags
 ====
 These tags may be present in multiple event kinds. Whenever a different meaning is not specified by some more specific NIP, they have the following meanings:
  - `r`: a web URL the event is referring to in some way
--- a/25.md
+++ b/25.md
@ -7,7 +7,7 @@ Reactions
 `draft` `optional` `author:jb55`
-A reaction is a `kind 7` note that is used to react to other notes.
+A reaction is a `kind 7` event that is used to react to other events.
 The generic reaction, represented by the `content` set to a `+` string, SHOULD
 be interpreted as a "like" or "upvote".
@ -19,7 +19,8 @@ dislikes in a reddit-like system of upvotes and downvotes, or display them as
 separate tallies.
 The `content` MAY be an emoji, or [NIP-30](30.md) custom emoji in this case it MAY be interpreted as a "like" or "dislike",
-or the client MAY display this emoji reaction on the post.
+or the client MAY display this emoji reaction on the post. If the `content` is an empty string then the client should
 consider it a "+".
 Tags
 ----
@ -33,6 +34,9 @@ The last `e` tag MUST be the `id` of the note that is being reacted to.
 The last `p` tag MUST be the `pubkey` of the event being reacted to.
 The reaction event MAY include a `k` tag with the stringified kind number
 of the reacted event as its value.
 Example code
 ```swift
@ -42,6 +46,7 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
    }
    tags.append(["e", liked.id])
    tags.append(["p", liked.pubkey])
    tags.append(["k", liked.kind])
    let ev = NostrEvent(content: "+", pubkey: pubkey, kind: 7, tags: tags)
    ev.calculate_id()
    ev.sign(privkey: privkey)
--- 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.
--- a/38.md
+++ b/38.md
@ -0,0 +1,61 @@
 NIP-38
 ======
 User Statuses
 --------------
 `draft` `optional` `author:jb55`
 ## Abstract
 This NIP enables a way for users to share live statuses such as what music they are listening to, as well as what they are currently doing: work, play, out of office, etc.
 ## Live Statuses
 A special event with `kind:30315` "User Status" is defined as an *optionally expiring* _parameterized replaceable event_, where the `d` tag represents the status type:
 For example:
 ```js
 {
  "kind": 30315,
  "content": "Sign up for nostrasia!",
  "tags": [
    ["d", "general"],
    ["r", "https://nostr.world"]
  ],
 }
 {
  "kind": 30315,
  "content": "Intergalatic - Beastie Boys",
  "tags": [
    ["d", "music"],
    ["r", "spotify:search:Intergalatic%20-%20Beastie%20Boys"],
    ["expiration", "1692845589"]
  ],
 }
 ```
 Two common status types are defined: `general` and `music`. `general` represent general statuses: "Working", "Hiking", etc.
 `music` status events are for live streaming what you are currently listening to. The expiry of the `music` status should be when the track will stop playing.
 Any other status types can be used but they are not defined by this NIP.
 The status MAY include an `r`, `p`, `e` or `a` tag linking to a URL, profile, note, or parameterized replaceable event.
 # Client behavior
 Clients MAY display this next to the username on posts or profiles to provide live user status information.
 # Use Cases
 * Calendar nostr apps that update your general status when you're in a meeting
 * Nostr Nests that update your general status with a link to the nest when you join
 * Nostr music streaming services that update your music status when you're listening
 * Podcasting apps that update your music status when you're listening to a podcast, with a link for others to listen as well
 * Clients can use the system media player to update playing music status
 The `content` MAY include emoji(s), or [NIP-30](30.md) custom emoji(s). If the `content` is an empty string then the client should clear the status.
--- a/45.md
+++ b/45.md
@ -21,6 +21,7 @@ This NIP defines the verb `COUNT`, which accepts a subscription id and filters a
 ```
 Counts are returned using a `COUNT` response in the form `{"count": <integer>}`. Relays may use probabilistic counts to reduce compute requirements.
 In case a relay uses probabilistic counts, it MAY indicate it in the response with `approximate` key i.e. `{"count": <integer>, "approximate": <true|false>}`.
 ```
 ["COUNT", <subscription_id>, {"count": <integer>}]
@ -36,4 +37,8 @@ Examples:
 # Count posts and reactions
 ["COUNT", <subscription_id>, {"kinds": [1, 7], "authors": [<pubkey>]}]
 ["COUNT", <subscription_id>, {"count": 5}]
 # Count posts approximately
 ["COUNT", <subscription_id>, {"kinds": [1]}]
 ["COUNT", <subscription_id>, {"count": 93412452, "approximate": true}]
 ```
--- 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` `author:gzuuus`
 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
@ -86,6 +84,43 @@ Then the user would create a 'Categorized People' list event like below:
 }
 ```
 Lets say a user wants to create a 'Categorized Bookmarks' list of `bookmarks` and has keys:
 ```
 priv: fb505c65d4df950f5d28c9e4d285ee12ffaf315deef1fc24e3c7cd1e7e35f2b1
 pub: b1a5c93edcc8d586566fde53a20bdb50049a97b15483cb763854e57016e0fa3d
 ```
 The user wants to publicly include these bookmarks:
 ```json
 ["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
 ["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
 ["r", "https://github.com/nostr-protocol/nostr", "Nostr repository"],
 ```
 and privately include these bookmarks (below is the JSON that would be encrypted and placed in the event content):
 ```json
 [
    ["r", "https://my-private.bookmark", "My private bookmark"],
    ["a", "30001:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
 ]
 ```
 Then the user would create a 'Categorized Bookmarks' list event like below:
 ```json
 {
  "kind": 30001,
  "tags": [
    ["d", "bookmarks"],
    ["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
    ["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
    ["r", "https://github.com/nostr-protocol/nostr", "Nostr repository"],
  ],
  "content": "y3AyaLJfnmYr9x9Od9o4aYrmL9+Ynmsim5y2ONrU0urOTq+V81CyAthQ2mUOWE9xwGgrizhY7ILdQwWhy6FK0sA33GHtC0egUJw1zIdknPe7BZjznD570yk/8RXYgGyDKdexME+RMYykrnYFxq1+y/h00kmJg4u+Gpn+ZjmVhNYxl9b+TiBOAXG9UxnK/H0AmUqDpcldn6+j1/AiStwYZhD1UZ3jzDIk2qcCDy7MlGnYhSP+kNmG+2b0T/D1L0Z7?iv=PGJJfPE84gacAh7T0e6duQ==",
  ...other fields
 }
 ```
 ## List Event Kinds
 | kind   | list type               |
@ -95,6 +130,7 @@ Then the user would create a 'Categorized People' list event like below:
 | 30000  | Categorized People      |
 | 30001  | Categorized Bookmarks   |
 ### Mute List
 An event with kind `10000` is defined as a replaceable list event for listing content a user wants to mute. Any standardized tag can be included in a Mute List.
@ -109,4 +145,4 @@ An event with kind `30000` is defined as a parameterized replaceable list event
 ### Categorized Bookmarks List
-An event with kind `30001` is defined as a parameterized replaceable list event for categorizing bookmarks. The 'd' parameter for this event holds the category name of the list. Any standardized tag can be included in a Categorized Bookmarks List.
+An event of kind `30001` is defined as a parameterized replaceable list event for categorizing bookmarks. The 'd' parameter for this event holds the category name of the list. The bookmark lists may contain metadata tags such as 'title', 'image', 'summary' as defined in [NIP-23 - Long-form Content](23.md). Any standardized tag can be included in a Categorized Bookmark List.
--- 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.
@ -30,7 +30,7 @@ The list of tags are as follows:
 * `start` (required) inclusive start date in ISO 8601 format (YYYY-MM-DD). Must be less than `end`, if it exists.
 * `end` (optional) exclusive end date in ISO 8601 format (YYYY-MM-DD). If omitted, the calendar event ends on the same date as `start`.
 * `location` (optional) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
-* `g` (optional) [geohash](https://en.wikipedia.org/wiki/Geohash) to associate calendar event with a searchable physical location as suggested as an example by [NIP-12](12.md)
+* `g` (optional) [geohash](https://en.wikipedia.org/wiki/Geohash) to associate calendar event with a searchable physical location
 * `p` (optional, repeated) 32-bytes hex pubkey of a participant, optional recommended relay URL, and participant's role in the meeting
 * `t` (optional, repeated) hashtag to categorize calendar event
 * `r` (optional, repeated) references / links to web pages, documents, video calls, recorded videos, etc.
@ -88,7 +88,7 @@ The list of tags are as follows:
 * `start_tzid` (optional) time zone of the start timestamp, as defined by the IANA Time Zone Database. e.g., `America/Costa_Rica`
 * `end_tzid` (optional) time zone of the end timestamp, as defined by the IANA Time Zone Database. e.g., `America/Costa_Rica`. If omitted and `start_tzid` is provided, the time zone of the end timestamp is the same as the start timestamp.
 * `location` (optional) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
-* `g` (optional) [geohash](https://en.wikipedia.org/wiki/Geohash) to associate calendar event with a searchable physical location as suggested as an example by [NIP-12](12.md)
+* `g` (optional) [geohash](https://en.wikipedia.org/wiki/Geohash) to associate calendar event with a searchable physical location
 * `p` (optional, repeated) 32-bytes hex pubkey of a participant, optional recommended relay URL, and participant's role in the meeting
 * `t` (optional, repeated) hashtag to categorize calendar event
 * `r` (optional, repeated) references / links to web pages, documents, video calls, recorded videos, etc.
@ -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.
--- 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:
@ -50,7 +50,7 @@ Clients are expected to subscribe to `kind:30311` events in general or for given
 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
@ -122,4 +122,3 @@ Live Streaming chat message
  "sig": "997f62ddfc0827c121043074d50cfce7a528e978c575722748629a4137c45b75bdbc84170bedc723ef0a5a4c3daebf1fef2e93f5e2ddb98e5d685d022c30b622"
 }
 ````
--- a/57.md
+++ b/57.md
@ -45,7 +45,7 @@ Example:
  "kind": 9734,
  "content": "Zap!",
  "tags": [
-    ["relays", "wss://nostr-pub.wellorder.com"],
+    ["relays", "wss://nostr-pub.wellorder.com", "wss://anotherrelay.example.com"],
    ["amount", "21000"],
    ["lnurl", "lnurl1dp68gurn8ghj7um5v93kketj9ehx2amn9uh8wetvdskkkmn0wahz7mrww4excup0dajx2mrv92x9xp"],
    ["p", "04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9"],
@ -66,7 +66,7 @@ A signed `zap request` event is not published, but is instead sent using a HTTP
 - `nostr` is the `9734` `zap request` event, JSON encoded then URI encoded
 - `lnurl` is the lnurl pay url of the recipient, encoded using bech32 with the prefix `lnurl`
-This request should return a JSON response with a `pr` key, which is the invoice the sender must pay to finalize his zap. Here is an example flow:
+This request should return a JSON response with a `pr` key, which is the invoice the sender must pay to finalize his zap. Here is an example flow in javascript:
 ```javascript
 const senderPubkey // The sender's pubkey
@ -78,7 +78,7 @@ const sats = 21
 const amount = sats * 1000
 const relays = ['wss://nostr-pub.wellorder.net']
 const event = encodeURI(JSON.stringify(await signEvent({
-  kind: [9734],
+  kind: 9734,
  content: "",
  pubkey: senderPubkey,
  created_at: Math.round(Date.now() / 1000),
@ -128,7 +128,7 @@ The following should be true of the `zap receipt` event:
 - The `content` SHOULD be empty.
 - The `created_at` date SHOULD be set to the invoice `paid_at` date for idempotency.
- `tags` MUST include the `p` tag AND optional `e` tag from the `zap request`.
+- `tags` MUST include the `p` tag AND optional `e` tag from the `zap request` AND optional `a` tag from the `zap request`.
 - The `zap receipt` MUST have a `bolt11` tag containing the description hash bolt11 invoice.
 - The `zap receipt` MUST contain a `description` tag which is the JSON-encoded invoice description.
 - `SHA256(description)` MUST match the description hash in the bolt11 invoice.
--- 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
 be updated.
-2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing
+2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing a "Badge Definition" event and one or more `p` tags, one for each pubkey the badge issuer wishes to award. Awarded badges are immutable and non-transferrable.
 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`.
--- a/65.md
+++ b/65.md
@ -4,63 +4,13 @@ NIP-65
 Relay List Metadata
 -------------------
-`draft` `optional` `author:mikedilger`
+`draft` `optional` `author:mikedilger` `author:vitorpamplona`
-A special replaceable event meaning "Relay List Metadata" is defined as an event with kind `10002` having a list of `r` tags, one for each relay the author uses to either read or write to.
+Defines a replaceable event using `kind:10002` to advertise preferred relays for discovering a user's content and receiving fresh content from others.
-The primary purpose of this relay list is to advertise to others, not for configuring one's client.
+The event MUST include a list of `r` tags with relay URIs and a `read` or `write` marker. If the marker is omitted, the relay is used for both purposes.
-The `content` is not used and SHOULD be an empty string.
+The `.content` is not used.
 The `r` tags can have a second parameter as either `read` or `write`. If it is omitted, it means the author uses the relay for both purposes.
 Clients SHOULD, as with all replaceable events, use only the most recent kind-10002 event they can find.
 ### The meaning of read and write
 Write relays are for events that are intended for anybody (e.g. your followers). Read relays are for events that address a particular person.
 Clients SHOULD write feed-related events created by their user to their user's write relays.
 Clients SHOULD read feed-related events created by another from at least some of that other person's write relays. Explicitly, they SHOULD NOT expect them to be available at their user's read relays. It SHOULD NOT be presumed that the user's read relays coincide with the write relays of the people the user follows.
 Clients SHOULD read events that tag their user from their user's read relays.
 Clients SHOULD write events that tag a person to at least some of that person's read relays. Explicitly, they SHOULD NOT expect that person will pick them up from their user's write relays. It SHOULD NOT be presumed that the user's write relays coincide with the read relays of the person being tagged.
 Clients SHOULD presume that if their user has a pubkey in their ContactList (kind 3) that it is because they wish to see that author's feed-related events. But clients MAY presume otherwise.
 ### Motivation
 There is a common nostr use case where users wish to follow the content produced by other users. This is evidenced by the implicit meaning of the Contact List in [NIP-02](02.md)
 Because users don't often share the same sets of relays, ad-hoc solutions have arisen to get that content, but these solutions negatively impact scalability and decentralization:
  - Most people are sending their posts to the same most popular relays in order to be more widely seen
  - Many people are pulling from a large number of relays (including many duplicate events) in order to get more data
  - Events are being copied between relays, oftentimes to many different relays
 ### Purposes
 The purpose of this NIP is to help clients find the events of the people they follow, to help tagged events get to the people tagged, and to help nostr scale better.
 ### Suggestions
 It is suggested that people spread their kind `10002` events to many relays, but write their normal feed-related events to a much smaller number of relays (between 2 to 6 relays). It is suggested that clients offer a way for users to spread their kind `10002` events to many more relays than they normally post to.
 Authors may post events outside of the feed that they wish their followers to follow by posting them to relays outside of those listed in their "Relay List Metadata".  For example, an author may want to reply to someone without all of their followers watching.
 It is suggested that relays allow any user to write their own kind `10002` event (optionally with AUTH to verify it is their own) even if they are not otherwise subscribed to the relay because
  - finding where someone posts is rather important
  - these events do not have `content` that needs management
  - relays only need to store one replaceable event per pubkey to offer this service
 ### Why not in kind `0` Metadata
 Even though this is user related metadata, it is a separate event from kind `0` in order to keep it small (as it should be widely spread) and to not have `content` that may require moderation by relay operators so that it is more acceptable to relays.
 ### Example
 ```json
 {
@ -74,3 +24,40 @@ Even though this is user related metadata, it is a separate event from kind `0`
  "content": "",
  ...other fields
 ```
 This NIP doesn't fully replace relay lists that are designed to configure a client's usage of relays (such as `kind:3` style relay lists). Clients MAY use other relay lists in situations where a `kind:10002` relay list cannot be found.
 ## When to Use Read and Write
 When seeking events **from** a user, Clients SHOULD use the WRITE relays of the user's `kind:10002`
 When seeking events **about** a user, where the user was tagged, Clients SHOULD use the READ relays of the user's `kind:10002` 
 When broadcasting an event, Clients SHOULD:
 - Broadcast the event to the WRITE relays of the author
 - Broadcast the event all READ relays of each tagged user. 
 ## Motivation
 The old model of using a fixed relay list per user centralizes in large relay operators: 
  - Most users submit their posts to the same highly popular relays, aiming to achieve greater visibility among a broader audience.
  - Many users are pulling events from a large number of relays in order to get more data at the expense of duplication
  - Events are being copied between relays, oftentimes to many different relays
 This NIP allows Clients to connect directly with the most up-to-date relay set from each individual user, eliminating the need of broadcasting events to popular relays. 
 ## Final Considerations
 1. Clients SHOULD guide users to keep `kind:10002` lists small (2-4 relays). 
 2. Clients SHOULD spread an author's `kind:10002` events to as many relays as viable. 
 3. `kind:10002` events should primarily be used to advertise the user's preferred relays to others. A user's own client may use other heuristics for selecting relays for fetching data.
 4. DMs SHOULD only be broadcasted to the author's WRITE relays and to the receiver's READ relays to keep maximum privacy. 
 5. If a relay signals support for this NIP in their [NIP-11](11.md) document that means they're willing to accept kind 10002 events from a broad range of users, not only their paying customers or whitelisted group.
 6. Clients SHOULD deduplicate connections by normalizing relay URIs according to [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986#section-6).
--- 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
@ -60,7 +60,7 @@ Community management clients MAY filter all mentions to a given `kind:34550` eve
 # Post Approval by moderators
-The post-approval event MUST include `a` tags of the communities the moderator is posting into (one or more), the `e` tag of the post and `p` tag of the author of the post (for approval notificaitons). The event SHOULD also include the stringified `post request` event inside the `.content` ([NIP-18-style](18.md)) and a `k` tag with the original post's event kind to allow filtering of approved posts by kind.
+The post-approval event MUST include `a` tags of the communities the moderator is posting into (one or more), the `e` tag of the post and `p` tag of the author of the post (for approval notifications). The event SHOULD also include the stringified `post request` event inside the `.content` ([NIP-18-style](18.md)) and a `k` tag with the original post's event kind to allow filtering of approved posts by kind.
 ```json
 {
@ -78,7 +78,7 @@ The post-approval event MUST include `a` tags of the communities the moderator i
 }
 ```
-It's recommended that multiple moderators approve posts to avoid deleting them from the community when a moderator is removed from the owner's list. In case the full list of moderators must be rotated, the new moderator set must sign new approvals for posts in the past or the community will restart. The owner can also periodically copy and re-sign of each moderator's approval events to make sure posts don't dissapear with moderators.
+It's recommended that multiple moderators approve posts to avoid deleting them from the community when a moderator is removed from the owner's list. In case the full list of moderators must be rotated, the new moderator set must sign new approvals for posts in the past or the community will restart. The owner can also periodically copy and re-sign of each moderator's approval events to make sure posts don't disappear with moderators.
 Post Approvals of replaceable events can be created in three ways: (i) by tagging the replaceable event as an `e` tag if moderators want to approve each individual change to the repleceable event; (ii) by tagging the replaceable event as an `a` tag if the moderator authorizes the replaceable event author to make changes without additional approvals and (iii) by tagging the replaceable event with both its `e` and `a` tag which empowers clients to display the original and updated versions of the event, with appropriate remarks in the UI. Since relays are instructed to delete old versions of a replaceable event, the `.content` of an `e`-approval MUST have the specific version of the event or Clients might not be able to find that version of the content anywhere.
--- a/75.md
+++ b/75.md
@ -0,0 +1,76 @@
 # NIP-75
 ## Zap Goals
 `draft` `optional` `author:verbiricha`
 This NIP defines an event for creating fundraising goals. Users can contribute funds towards the goal by zapping the goal event.
 ## Nostr Event
 A `kind:9041` event is used.
 The `.content` contains a human-readable description of the goal.
 The following tags are defined as REQUIRED.
 - `amount` - target amount in milisats.
 - `relays` - a list of relays the zaps to this goal will be sent to and tallied from.
 Example event:
 ```json
 {
  "kind": 9041,
  "tags": [
    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", ...],
    ["amount", "210000"],
  ],
  "content": "Nostrasia travel expenses",
  ...other fields
 ```
 The following tags are OPTIONAL.
 - `closed_at` - timestamp for determining which zaps are included in the tally. Zap receipts published after the `closed_at` timestamp SHOULD NOT count towards the goal progress.
 ```json
 {
  "kind": 9041,
  "tags": [
    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", ...],
    ["amount", "210000"],
    ["closed_at", "<unix timestamp in seconds>"],
  ],
  "content": "Nostrasia travel expenses",
  ...other fields
 ```
 The goal MAY include an `r` or `a` tag linking to a URL or parameterized replaceable event.
 The goal MAY include multiple beneficiary pubkeys by specifying [`zap` tags](57.md#appendix-g-zap-tag-on-other-events).
 Parameterized replaceable events can link to a goal by using a `goal` tag specifying the event id and an optional relay hint.
 ```json
 {
  "kind": 3XXXX,
  "tags": [
    ...
    ["goal", "<event id>", "<Relay URL (optional)>"],
  ],
  ...other fields
 ```
 ## Client behavior
 Clients MAY display funding goals on user profiles.
 When zapping a goal event, clients MUST include the relays in the `relays` tag of the goal event in the zap request `relays` tag.
 When zapping a parameterized replaceable event with a `goal` tag, clients SHOULD tag the goal event id in the `e` tag of the zap request.
 ## Use cases
 - Fundraising clients
 - Adding funding goals to events such as long form posts, badges or live streams
--- a/89.md
+++ b/89.md
@ -61,7 +61,7 @@ The third value of the tag SHOULD be the platform where this recommendation migh
 }
 ```
-* `content` is an optional `set_metadata`-like stringified JSON object, as described in NIP-01. This content is useful when the pubkey creating the `kind:31990` is not an application. If `content` is empty, the `kind:0` of the pubkey should be used to display application information (e.g. name, picture, web, LUD16, etc.)
+* `content` is an optional `metadata`-like stringified JSON object, as described in NIP-01. This content is useful when the pubkey creating the `kind:31990` is not an application. If `content` is empty, the `kind:0` of the pubkey should be used to display application information (e.g. name, picture, web, LUD16, etc.)
 * `k` tags' value is the event kind that is supported by this `kind:31990`.
 Using a `k` tag(s) (instead of having the kind onf the NIP-33 `d` tag) provides:
--- a/94.md
+++ b/94.md
@ -13,7 +13,7 @@ The purpose of this NIP is to allow an organization and classification of shared
 This NIP specifies the use of the `1063` event type, having in `content` a description of the file content, and a list of tags described below:
 * `url` the url to download the file
-* `m` a string indicating the data type of the file. The MIME types format must be used (https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types)
+* `m` a string indicating the data type of the file. The [MIME types](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types) format must be used, and they should be lowercase.
 * `"aes-256-gcm"` (optional)  key and nonce for AES-GCM encryption with tagSize always 128bits
 * `x` containing the SHA-256 hexencoded string of the file.
 * `size` (optional) size of file in bytes
@ -21,6 +21,10 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 * `magnet` (optional) URI to magnet file
 * `i` (optional) torrent infohash
 * `blurhash`(optional) the [blurhash](https://github.com/woltapp/blurhash) to show while the file is being loaded by the client
 * `thumb` (optional) url of thumbnail with same aspect ratio
 * `image` (optional) url of preview image with same dimensions
 * `summary` (optional) text excerpt
 * `alt` (optional) description for accessibility
 ```json
 {
@ -37,9 +41,13 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
    ["dim", <size of file in pixels>],
    ["magnet",<magnet URI> ],
    ["i",<torrent infohash>],
-    ["blurhash", <value>]
+    ["blurhash", <value>],
    ["thumb", <string with thumbnail URI>],
    ["image", <string with preview URI>],
    ["summary", <excerpt>],
    ["alt", <description>]
  ],
-  "content": <description>,
+  "content": <caption>,
  "sig": <64-bytes hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
 }
 ```
--- a/98.md
+++ b/98.md
@ -6,9 +6,9 @@ HTTP Auth
 `draft` `optional` `author:kieran` `author:melvincarvalho`
-This NIP defines an ephemerial event used to authorize requests to HTTP servers using nostr events.
+This NIP defines an ephemeral event used to authorize requests to HTTP servers using nostr events.
-This is useful for HTTP services which are build for Nostr and deal with Nostr user accounts.
+This is useful for HTTP services which are built for Nostr and deal with Nostr user accounts.
 ## Nostr event
@ -16,7 +16,7 @@ A `kind 27235` (In reference to [RFC 7235](https://www.rfc-editor.org/rfc/rfc723
 The `content` SHOULD be empty.
-The following tags are defined as REQUIRED.
+The following tags MUST be included.
 * `u` - absolute URL
 * `method` - HTTP Request Method
@ -45,7 +45,7 @@ Example event:
 Servers MUST perform the following checks in order to validate the event:
 1. The `kind` MUST be `27235`.
-2. The `created_at` MUST be within a reasonable time window (suggestion 60 seconds).
+2. The `created_at` timestamp MUST be within a reasonable time window (suggestion 60 seconds).
 3. The `u` tag MUST be exactly the same as the absolute request URL (including query parameters).
 4. The `method` tag MUST be the same HTTP method used for the requested resource.
@ -53,11 +53,11 @@ When the request contains a body (as in POST/PUT/PATCH methods) clients SHOULD i
 If one of the checks was to fail the server SHOULD respond with a 401 Unauthorized response code.
-All other checks which server MAY do are OPTIONAL, and implementation specific.
+Servers MAY perform additional implementation-specific validation checks.
 ## Request Flow
-Using the `Authorization` header, the `kind 27235` event MUST be `base64` encoded and use the Authorization scheme `Nostr`
+Using the `Authorization` HTTP header, the `kind 27235` event MUST be `base64` encoded and use the Authorization scheme `Nostr`
 Example HTTP Authorization header:
 ```
--- a/README.md
+++ b/README.md
@ -30,17 +30,15 @@ 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)
 - [NIP-24: Extra metadata fields and tags](24.md)
 - [NIP-25: Reactions](25.md)
 - [NIP-26: Delegated Event Signing](26.md)
 - [NIP-27: Text Note References](27.md)
@ -48,8 +46,8 @@ 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-38: User Statuses](38.md)
 - [NIP-39: External Identities in Profiles](39.md)
 - [NIP-40: Expiration Timestamp](40.md)
 - [NIP-42: Authentication of clients to relays](42.md)
@ -57,7 +55,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-46: Nostr Connect](46.md)
 - [NIP-47: Wallet Connect](47.md)
 - [NIP-48: Proxy Tags](48.md)
- [NIP-50: Keywords filter](50.md)
+- [NIP-50: Search Capability](50.md)
 - [NIP-51: Lists](51.md)
 - [NIP-52: Calendar Events](52.md)
 - [NIP-53: Live Activities](53.md)
@ -66,6 +64,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-58: Badges](58.md)
 - [NIP-65: Relay List Metadata](65.md)
 - [NIP-72: Moderated Communities](72.md)
 - [NIP-75: Zap Goals](75.md)
 - [NIP-78: Application-specific data](78.md)
 - [NIP-89: Recommended Application Handlers](89.md)
 - [NIP-90: Data Vending Machines](90.md)
@ -79,7 +78,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)  |
@ -94,9 +93,11 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `44`    | Channel Mute User          | [28](28.md) |
 | `1063`  | File Metadata              | [94](94.md) |
 | `1311`  | Live Chat Message          | [53](53.md) |
 | `1040`  | OpenTimestamps             | [03](03.md) |
 | `1984`  | Reporting                  | [56](56.md) |
 | `1985`  | Label                      | [32](32.md) |
 | `4550`  | Community Post Approval    | [72](72.md) |
 | `9041`  | Zap Goal                   | [75](75.md) |
 | `9734`  | Zap Request                | [57](57.md) |
 | `9735`  | Zap                        | [57](57.md) |
 | `10000` | Mute List                  | [51](51.md) |
@ -118,6 +119,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30024` | Draft Long-form Content    | [23](23.md) |
 | `30078` | Application-specific Data  | [78](78.md) |
 | `30311` | Live Event                 | [53](53.md) |
 | `30315` | User Statuses              | [38](38.md) |
 | `30402` | Classified Listing         | [99](99.md) |
 | `30403` | Draft Classified Listing   | [99](99.md) |
 | `31922` | Date-Based Calendar Event  | [52](52.md) |
@ -130,68 +132,58 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `65000` | Job Feedback               | [90](90.md) |
 | `65001` | Job Result                 | [90](90.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) |
 | `65002`--`66000` | Job Requests                     | [90](90.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)              |
-| `alt`             | Alt tag                              | --                   | [31](31.md)              |
+| `p`               | pubkey (hex)                         | relay URL, petname   | [01](01.md), [02](02.md)              |
-| `d`               | identifier                           | --                   | [33](33.md)              |
+| `a`               | coordinates to an event              | relay URL            | [01](01.md)                           |
-| `e`               | event id (hex)                       | relay URL, marker    | [1](01.md), [10](10.md)  |
+| `d`               | identifier                           | --                   | [01](01.md)                           |
-| `g`               | geohash                              | --                   | [12](12.md), [52](52.md) |
+| `alt`             | summary                              | --                   | [31](31.md)                           |
 | `g`               | geohash                              | --                   | [52](52.md)                           |
 | `i`               | identity                             | proof                | [39](39.md)                           |
-| `k`               | kind number (string)                 | --                   | [18](18.md), [72](72.md) |
+| `k`               | kind number (string)                 | --                   | [18](18.md), [25](25.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)               |
+| `m`               | MIME type                            | --                   | [94](94.md)                           |
-| `r`               | a reference (URL, etc)               | --                   | [12](12.md)              |
+| `r`               | a reference (URL, etc)               | petname              |                                       |
-| `t`               | hashtag                              | --                   | [12](12.md)              |
+| `r`               | relay url                            | marker               | [65](65.md)                           |
-| `amount`          | millisats                            | --                   | [57](57.md)              |
+| `t`               | hashtag                              | --                   |                                       |
 | `amount`          | millisatoshis, stringified           | --                   | [57](57.md)                           |
 | `bolt11`          | `bolt11` invoice                     | --                   | [57](57.md)                           |
 | `challenge`       | challenge string                     | --                   | [42](42.md)                           |
 | `content-warning` | reason                               | --                   | [36](36.md)                           |
 | `delegation`      | pubkey, conditions, delegation token | --                   | [26](26.md)                           |
-| `description`     | badge description                    | --                   | [58](58.md)              |
+| `description`     | invoice/badge description            | --                   | [57](57.md), [58](58.md)              |
 | `description`     | invoice description                  | --                   | [57](57.md)              |
 | `emoji`           | shortcode, image URL                 | --                   | [30](30.md)                           |
 | `expiration`      | unix timestamp (string)              | --                   | [40](40.md)                           |
 | `goal`            | event id (hex)                       | relay URL            | [75](75.md)                           |
 | `image`           | image URL                            | dimensions in pixels | [23](23.md), [58](58.md)              |
 | `lnurl`           | `bech32` encoded `lnurl`             | --                   | [57](57.md)                           |
 | `location`        | location string                      | --                   | [52](52.md), [99](99.md)              |
@ -207,7 +199,7 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
 | `summary`         | article summary                      | --                   | [23](23.md)                           |
 | `thumb`           | badge thumbnail                      | dimensions in pixels | [58](58.md)                           |
 | `title`           | article title                        | --                   | [23](23.md)                           |
-| `zap`             | profile name                         | type of value        | [57](57.md)              |
+| `zap`             | pubkey (hex), relay URL              | weight               | [57](57.md)                           |
 ## Criteria for acceptance of NIPs