19 files changed, 538 insertions, 41 deletions

diff --git a/01.md b/01.md
index 2700dab..50e9c9c 100644
--- a/01.md
+++ b/01.md
@@ -16,7 +16,7 @@ The only object type that exists is the `event`, which has the following format
 
 ```json
 {
-  "id": <32-bytes lowercase hex-encoded sha256 of the serialized event data>
+  "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>,
@@ -55,7 +55,7 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   * `["REQ", <subscription_id>, <filters JSON>...]`, used to request events and subscribe to new updates.
   * `["CLOSE", <subscription_id>]`, used to stop previous subscriptions.
 
-`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars, that should be used to represent a subscription.
+`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars, that should be used to represent a subscription. Relays should manage `<subscription_id>`s independently for each WebSocket connection; even if `<subscription_id>`s are the same string, they should be treated as different subscriptions for different connections.
 
 `<filters>` is a JSON object that determines what events will be sent in that subscription, it can have the following attributes:
 
@@ -66,8 +66,8 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   "kinds": <a list of a kind numbers>,
   "#e": <a list of event ids that are referenced in an "e" tag>,
   "#p": <a list of pubkeys that are referenced in a "p" tag>,
-  "since": <an integer unix timestamp, events must be newer than this to pass>,
-  "until": <an integer unix timestamp, events must be older than this to pass>,
+  "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>
 }
 ```
@@ -78,11 +78,13 @@ Filter attributes containing lists (such as `ids`, `kinds`, or `#e`) are JSON ar
 
 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 `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.
+
 All conditions of a filter that are specified must match for an event for it to pass the filter, i.e., multiple conditions are interpreted as `&&` conditions.
 
 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 latest `n` events. 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 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.
 
 ### From relay to client: sending events and notices
 
@@ -107,6 +109,7 @@ A relay may choose to treat different message kinds differently, and it may or m
 ## Other Notes:
 
 - 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 tag identifier 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 `tags` array can store a case-sensitive tag name as the first element of each subarray, plus arbitrary information afterward (always as strings). This NIP defines `"p"` — meaning "pubkey", which points to a pubkey of someone that is referred to in the event —, and `"e"` — meaning "event", which points to the id of an event this event is quoting, replying to or referring to somehow. See [NIP-10](10.md) for a detailed description of "e" and "p" tags.
 - The `<recommended relay URL>` item present on the `"e"` and `"p"` tags is an optional (could be set to `""`) URL of a relay the client could attempt to connect to fetch the tagged event or other events from a tagged profile. It MAY be ignored, but it exists to increase censorship resistance and make the spread of relay addresses more seamless across clients.
 - Clients should use the created_at field to judge the age of a metadata event and completely replace older metadata events with newer metadata events regardless of the order in which they arrive.  Clients should not merge any filled fields within older metadata events into empty fields of newer metadata events.
+- When a websocket is closed by the relay with a status code 4000 that means the client shouldn't try to connect again.
diff --git a/09.md b/09.md
index a73e0ab..9dab90f 100644
--- a/09.md
+++ b/09.md
@@ -8,7 +8,7 @@ Event Deletion
 
 A special event with kind `5`, meaning "deletion" is defined as having a list of one or more `e` tags, each referencing an event the author is requesting to be deleted.
 
-Each tag entry must contain an "e" event id intended for deletion.
+Each tag entry must contain an "e" event id and/or NIP-33 `a` tags intended for deletion.
 
 The event's `content` field MAY contain a text note describing the reason for the deletion.
 
@@ -20,7 +20,8 @@ For example:
   "pubkey": <32-bytes hex-encoded public key of the event creator>,
   "tags": [
     ["e", "dcd59..464a2"],
-    ["e", "968c5..ad7a4"]
+    ["e", "968c5..ad7a4"],
+    ["a", "<kind>:<pubkey>:<d-identifier>"]
   ],
   "content": "these posts were published by accident",
   ...other fields
diff --git a/11.md b/11.md
index b0d6003..ec46b36 100644
--- a/11.md
+++ b/11.md
@@ -255,6 +255,18 @@ Relays that require payments may want to expose their fee schedules.
 }
 ```
 
+### Icon ###
+
+A URL pointing to an image to be used as an icon for the relay. Recommended to be squared in shape.
+
+```json
+{
+...
+  "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg",
+...
+}
+```
+
 ### Examples ###
 As of 2 May 2023 the following `curl` command provided these results.
 
@@ -281,4 +293,5 @@ As of 2 May 2023 the following `curl` command provided these results.
                                   "payment_required":true},
         "payments_url":"https://eden.nostr.land/invoices",
         "fees":{"admission":[{"amount":5000000,"unit":"msats"}],
-                "publication":[]}}
+                "publication":[]}}, 
+    "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg"
diff --git a/12.md b/12.md
index 74c9d81..7d1f46e 100644
--- a/12.md
+++ b/12.md
@@ -8,7 +8,7 @@ Generic Tag Queries
 
 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.
 
-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.
+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
 ---------------------------
diff --git a/14.md b/14.md
index 0b37e8a..7384394 100644
--- a/14.md
+++ b/14.md
@@ -1,8 +1,8 @@
 NIP-14
 ======
 
-Subject tag in Text events.
----------------------------
+Subject tag in Text events
+--------------------------
 
 `draft` `optional` `author:unclebobmartin`
 
diff --git a/18.md b/18.md
index 422ad9c..75c4100 100644
--- a/18.md
+++ b/18.md
@@ -6,11 +6,10 @@ Reposts
 
 `draft` `optional` `author:jb55` `author:fiatjaf` `author:arthurfranca`
 
-A repost is a `kind 6` note that is used to signal to followers
-that another event is worth reading.
+A repost is a `kind 6` event that is used to signal to followers
+that a `kind 1` text note is worth reading.
 
-The `content` of a repost event is empty. Optionally, it MAY contain
-the stringified JSON of the reposted note event for quick look up.
+The `content` of a repost event is _the stringified JSON of the reposted note_. It MAY also be empty, but that is not recommended.
 
 The repost event MUST include an `e` tag with the `id` of the note that is
 being reposted. That tag MUST include a relay URL as its third entry
@@ -21,5 +20,15 @@ reposted.
 
 ## Quote Reposts
 
-Quote reposts are `kind 1` events with an embedded `e` tag (see [NIP-08](08.md) and [NIP-27](27.md)).
-Because a quote repost includes an `e` tag, it may show up along replies to the reposted note.
+Quote reposts are `kind 1` events with an embedded `e` tag
+(see [NIP-08](08.md) and [NIP-27](27.md)). Because a quote repost includes
+an `e` tag, it may show up along replies to the reposted note.
+
+## Generic Reposts
+
+Since `kind 6` reposts are reserved for `kind 1` contents, we use `kind 16`
+as a "generic repost", that can include any kind of event inside other than
+`kind 1`.
+
+`kind 16` reposts SHOULD contain a `k` tag with the stringified kind number
+of the reposted event as its value.
diff --git a/23.md b/23.md
index 4291228..7a06b0e 100644
--- a/23.md
+++ b/23.md
@@ -12,7 +12,11 @@ This NIP defines `kind:30023` (a parameterized replaceable event according to [N
 
 ### Format
 
-The `.content` of these events should be a string text in Markdown syntax.
+The `.content` of these events should be a string text in Markdown syntax. To maximize compatibility and readability between different clients and devices, any client that is creating long form notes:
+
+- MUST NOT hard line-break paragraphs of text, such as arbitrary line breaks at 80 column boundaries.
+
+- MUST NOT support adding HTML to Markdown.
 
 ### Metadata
 
diff --git a/25.md b/25.md
index f74bcc0..86ce763 100644
--- a/25.md
+++ b/25.md
@@ -18,7 +18,7 @@ downvote or dislike on a post. A client MAY also choose to tally likes against
 dislikes in a reddit-like system of upvotes and downvotes, or display them as
 separate tallies.
 
-The `content` MAY be an emoji, in this case it MAY be interpreted as a "like" or "dislike",
+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.
 
 Tags
@@ -47,3 +47,25 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
     ev.sign(privkey: privkey)
     return ev
 }
+```
+
+Custom Emoji Reaction
+---------------------
+
+The client may specify a custom emoji ([NIP-30](30.md)) `:shortcode:` in the
+reaction content. The client should refer to the emoji tag and render the
+content as an emoji if shortcode is specified.
+
+```json
+{
+  "kind": 7,
+  "content": ":soapbox:",
+  "tags": [
+    ["emoji", "soapbox", "https://gleasonator.com/emoji/Gleasonator/soapbox.png"]
+  ],
+  "pubkey": "79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6",
+  "created_at": 1682790000
+}
+```
+
+The content can be set only one `:shortcode:`. And emoji tag should be one.
diff --git a/26.md b/26.md
index 9117699..59cf807 100644
--- a/26.md
+++ b/26.md
@@ -1,4 +1,4 @@
-NIP: 26
+NIP-26
 =======
 
 Delegated Event Signing
diff --git a/32.md b/32.md
new file mode 100644
index 0000000..ddd364a
--- /dev/null
+++ b/32.md
@@ -0,0 +1,126 @@
+NIP-32
+======
+
+Labeling
+---------
+
+`draft` `optional` `author:staab` `author:gruruya` `author:s3x-jay`
+
+A label is a `kind 1985` event that is used to label other entities. This supports a number of use cases, from distributed moderation and content recommendations to reviews and ratings.
+
+Label Target
+----
+
+The label event MUST include one or more tags representing the object or objects being
+labeled: `e`, `p`, `a`, `r`, or `t` tags. This allows for labeling of events, people, relays,
+or topics respectively. As with NIP-01, a relay hint SHOULD be included when using `e` and
+`p` tags.
+
+Label Tag
+----
+
+This NIP introduces a new tag `l` which denotes a label, and a new `L` tag which denotes a label namespace.
+A label MUST include a mark matching an `L` tag. `L` tags refer to a tag type within nostr, or a nomenclature
+external to nostr defined either formally or by convention. Any string can be a namespace, but publishers SHOULD
+ensure they are unambiguous by using a well-defined namespace (such as an ISO standard) or reverse domain name notation.
+
+Namespaces starting with `#` indicate that the label target should be associated with the label's value.
+This is a way of attaching standard nostr tags to events, pubkeys, relays, urls, etc.
+
+Some examples:
+
+- `["l", "footstr", "#t"]` - the publisher thinks the given entity should have the `footstr` topic applied.
+- `["l", "<pubkey>", "#p"]` - the publisher thinks the given entity is related to `<pubkey>`
+- `["l", "IT-MI", "ISO-3166-2"]` - Milano, Italy using ISO 3166-2.
+- `["l", "VI-hum", "com.example.ontology"]` - Violence toward a human being as defined by ontology.example.com.
+
+`L` tags containing the label namespaces MUST be included in order to support searching by
+namespace rather than by a specific tag. The special `ugc` ("user generated content") namespace
+MAY be used when the label content is provided by an end user.
+
+`l` and `L` tags MAY be added to other event kinds to support self-reporting. For events
+with a kind other than 1985, labels refer to the event itself.
+
+Label Annotations
+-----
+
+A label tag MAY include a 4th positional element detailing extra metadata about the label in question. This string
+should be a json-encoded object. Any key MAY be used, but the following are recommended:
+
+- `quality` may have a value of 0 to 1. This allows for an absolute, granular scale that can be represented in any way (5 stars, color scale, etc).
+- `confidence` may have a value of 0 to 1. This indicates the certainty which the author has about their rating.
+- `context` may be an array of urls (including NIP-21 urls) indicating other context that should be considered when interpreting labels.
+
+Content
+-------
+
+Labels should be short, meaningful strings. Longer discussions, such as for a review, or an
+explanation of why something was labeled the way it was, should go in the event's `content` field.
+
+Example events
+--------------
+
+A suggestion that multiple pubkeys be associated with the `permies` topic.
+
+```json
+{
+  "kind": 1985,
+  "tags": [
+    ["L", "#t"],
+    ["l", "permies", "#t"],
+    ["p", <pubkey1>, <relay_url>],
+    ["p", <pubkey2>, <relay_url>]
+  ],
+  "content": "",
+  ...
+}
+```
+
+A review of a relay.
+
+```json
+{
+  "kind": 1985,
+  "tags": [
+    ["L", "com.example.ontology"],
+    ["l", "relay/review", "com.example.ontology", "{\"quality\": 0.1}"],
+    ["r", <relay_url>]
+  ],
+  "content": "This relay is full of mean people.",
+  ...
+}
+```
+
+Publishers can self-label by adding `l` tags to their own non-1985 events.
+
+```json
+{
+  "kind": 1,
+  "tags": [
+    ["L", "com.example.ontology"],
+    ["l", "IL-frd", "com.example.ontology"]
+  ],
+  "content": "Send me 100 sats and I'll send you 200 back",
+  ...
+}
+```
+
+Other Notes
+-----------
+
+When using this NIP to bulk-label many targets at once, events may be deleted and a replacement
+may be published. We have opted not to use parameterizable/replaceable events for this due to the
+complexity in coming up with a standard `d` tag. In order to avoid ambiguity when querying,
+publishers SHOULD limit labeling events to a single namespace.
+
+Before creating a vocabulary, explore how your use case may have already been designed and
+imitate that design if possible. Reverse domain name notation is encouraged to avoid
+namespace clashes, but for the sake of interoperability all namespaces should be
+considered open for public use, and not proprietary. In other words, if there is a
+namespace that fits your use case, use it even if it points to someone else's domain name.
+
+Vocabularies MAY choose to fully qualify all labels within a namespace (for example,
+`["l", "com.example.vocabulary:my-label"]`. This may be preferred when defining more
+formal vocabularies that should not be confused with another namespace when querying
+without an `L` tag. For these vocabularies, all labels SHOULD include the namespace
+(rather than mixing qualified and unqualified labels).
diff --git a/36.md b/36.md
index 1223e53..6d1cf63 100644
--- a/36.md
+++ b/36.md
@@ -9,12 +9,15 @@ Sensitive Content / Content Warning
 The `content-warning` tag enables users to specify if the event's content needs to be approved by readers to be shown.
 Clients can hide the content until the user acts on it.
 
+`l` and `L` tags MAY be also be used as defined in [NIP-32](32.md) with the `content-warning` or other namespace to support
+further qualification and querying.
+
 #### Spec
 
 ```
 tag: content-warning
 options:
- - [reason]: optional  
+ - [reason]: optional
 ```
 
 #### Example
@@ -26,6 +29,10 @@ options:
     "kind": 1,
     "tags": [
       ["t", "hastag"],
+      ["L", "content-warning"],
+      ["l", "reason", "content-warning"],
+      ["L", "social.nos.ontology"],
+      ["l", "NS-nud", "social.nos.ontology"],
       ["content-warning", "reason"] /* reason is optional */
     ],
     "content": "sensitive content with #hastag\n",
diff --git a/47.md b/47.md
index c884b97..b6a4f2b 100644
--- a/47.md
+++ b/47.md
@@ -33,7 +33,7 @@ There are three event kinds:
 - `NIP-47 response`: 23195
 
 The info event should be a replaceable event that is published by the **wallet service** on the relay to indicate which commands it supports. The content should be
-a plaintext string with the supported commands, space-seperated, eg. `pay_invoice get_balance`. Only the `pay_invoice` command is described in this NIP, but other commands might be defined in different NIPs.
+a plaintext string with the supported commands, space-separated, eg. `pay_invoice get_balance`. Only the `pay_invoice` command is described in this NIP, but other commands might be defined in different NIPs.
 
 Both the request and response events SHOULD contain one `p` tag, containing the public key of the **wallet service** if this is a request, and the public key of the **user** if this is a response. The response event SHOULD contain an `e` tag with the id of the request event it is responding to.
 
@@ -64,8 +64,8 @@ Response:
 ```
 
 The `result_type` field MUST contain the name of the method that this event is responding to.
-The `error` field MUST contain a `message` field with a human readable error message and a `code` field with the error code if the command was not succesful.
-If the command was succesful, the `error` field must be null.
+The `error` field MUST contain a `message` field with a human readable error message and a `code` field with the error code if the command was not successful.
+If the command was successful, the `error` field must be null.
 
 ### Error codes
 - `RATE_LIMITED`: The client is sending commands too fast. It should retry in a few seconds.
diff --git a/53.md b/53.md
new file mode 100644
index 0000000..c5f2704
--- /dev/null
+++ b/53.md
@@ -0,0 +1,125 @@
+NIP-53
+======
+
+Live Activities
+---------------
+
+`draft` `optional` `author:vitorpamplona` `author:v0l`
+
+## Abstract
+
+Service providers want to offer live activities to the Nostr network in such a way that participants can easily logged and queried by clients. This NIP describes a general framework to advertise the involvement of pubkeys in such live activities.
+
+# 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.
+
+For example:
+
+```js
+{
+  "kind": 30311,
+  "tags": [
+    ["d", "<unique identifier>"],
+    ["title", "<name of the event>"],
+    ["summary", "<description>"],
+    ["image", "<preview image url>"],
+    ["t", "hashtag"]
+    ["streaming", "<url>"],
+    ["recording", "<url>"], // used to place the edited video once the activity is over
+    ["starts", "<unix timestamp in seconds>"],
+    ["ends", "<unix timestamp in seconds>"],
+    ["status", "<planned, live, ended>"],
+    ["current_participants", "<number>"],
+    ["total_participants", "<number>"],
+    ["p", "91cf9..4e5ca", "wss://provider1.com/", "Host", "<proof>"],
+    ["p", "14aeb..8dad4", "wss://provider2.com/nostr", "Speaker"],
+    ["p", "612ae..e610f", "ws://provider3.com/ws", "Participant"],
+    ["relays", "wss://one.com", "wss://two.com", ...]
+  ],
+  "content": "",
+  ...other fields
+}
+```
+
+A distinct `d` tag should be used for each activity. All other tags are optional.
+
+Providers SHOULD keep the participant list small (e.g. under 1000 users) and, when limits are reached, Providers SHOULD select which participants get named in the event. Clients should not expect a comprehensive list. Once the activity ends, the event can be deleted or updated to summarize the activity and provide async content (e.g. recording of the event). 
+
+Clients are expected to subscribe to `kind:30311` events in general or for given follow lists and statuses. Clients MAY display participants' roles in activities as well as access points to join the activity. 
+
+Live Activity management clients are expected to constantly update `kind:30311` during the event. Clients MAY choose to consider `status=live` events after 1hr without any update as `ended`. The `starts` and `ends` timestamp SHOULD be updated when the status changes to and from `live`
+
+The activity MUST be linked to using the NIP-19 naddr code along with the "a" tag (see [NIP-33](33.md) and [NIP-19](19.md)).
+
+## Proof of Agreement to Participate
+
+Event owners can add proof as the 5th term in each `p` tag to clarify the participant's agreement in joining the event. The proof is a signed SHA256 of the complete `a` Tag of the event (`kind:pubkey:dTag`) by each `p`'s private key, encoded in hex.
+
+Clients MAY only display participants if the proof is available or MAY display participants as "invited" if the proof is not available.
+
+This feature is important to avoid malicious event owners adding large account holders to the event, without their knowledge, to lure their followers into the malicious owner's trap.  
+
+# Live Chat Message
+
+Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used. 
+
+```js
+{
+  "id": "<32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>",
+  "pubkey": "<32-bytes lowercase hex-encoded public key of the event creator>",
+  "created_at": "<Unix timestamp in seconds>",
+  "kind": 1311,
+  "tags": [
+    ["a", "30311:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>", "root"],
+  ],
+  "content": "Zaps to live streams is beautiful."
+} 
+```
+
+# Use Cases
+
+Common use cases include meeting rooms/workshops, watch-together activities, or event spaces, such as [live.snort.social](https://live.snort.social) and [nostrnests.com](https://nostrnests.com).
+
+# Example
+
+Live Streaming 
+
+```json
+{
+  "id": "57f28dbc264990e2c61e80a883862f7c114019804208b14da0bff81371e484d2",
+  "pubkey": "1597246ac22f7d1375041054f2a4986bd971d8d196d7997e48973263ac9879ec",
+  "created_at": 1687182672,
+  "kind": 30311,
+  "tags": [
+    ["d", "demo-cf-stream"],
+    ["title", "Adult Swim Metalocalypse"],
+    ["summary", "Live stream from IPTV-ORG collection"],
+    ["streaming", "https://adultswim-vodlive.cdn.turner.com/live/metalocalypse/stream.m3u8"],
+        ["starts", "1687182672"]
+    ["status", "live"],
+    ["t", "animation"],
+    ["t", "iptv"],
+    ["image", "https://i.imgur.com/CaKq6Mt.png"]
+  ],
+  "content": "",
+  "sig": "5bc7a60f5688effa5287244a24768cbe0dcd854436090abc3bef172f7f5db1410af4277508dbafc4f70a754a891c90ce3b966a7bc47e7c1eb71ff57640f3d389"
+}
+```
+
+Live Streaming chat message
+
+```json
+{
+  "id": "97aa81798ee6c5637f7b21a411f89e10244e195aa91cb341bf49f718e36c8188",
+  "pubkey": "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24", 
+  "created_at": 1687286726,
+  "kind": 1311,
+  "tags": [
+    ["a", "30311:1597246ac22f7d1375041054f2a4986bd971d8d196d7997e48973263ac9879ec:demo-cf-stream", "", "root"]
+  ],
+  "content": "Zaps to live streams is beautiful.",
+  "sig": "997f62ddfc0827c121043074d50cfce7a528e978c575722748629a4137c45b75bdbc84170bedc723ef0a5a4c3daebf1fef2e93f5e2ddb98e5d685d022c30b622"
+}
+````
+
diff --git a/56.md b/56.md
index 55ee1a2..259118d 100644
--- a/56.md
+++ b/56.md
@@ -10,7 +10,7 @@ Reporting
 A report is a `kind 1984` note that is used to report other notes for spam,
 illegal and explicit content.
 
-The content MAY contain additional information submitted by the entity
+The `content` MAY contain additional information submitted by the entity
 reporting the content.
 
 Tags
@@ -32,6 +32,9 @@ being reported, which consists of the following report types:
 
 Some report tags only make sense for profile reports, such as `impersonation`
 
+`l` and `L` tags MAY be also be used as defined in [NIP-32](32.md) to support
+further qualification and querying.
+
 Example events
 --------------
 
@@ -39,7 +42,9 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    [ "p", <pubkey>, "nudity"]
+    ["p", <pubkey>, "nudity"],
+    ["L", "social.nos.ontology"],
+    ["l", "NS-nud", "social.nos.ontology"]
   ],
   "content": "",
   ...
@@ -48,8 +53,8 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    [ "e", <eventId>, "illegal"],
-    [ "p", <pubkey>]
+    ["e", <eventId>, "illegal"],
+    ["p", <pubkey>]
   ],
   "content": "He's insulting the king!",
   ...
@@ -58,10 +63,9 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    [ "p", <impersonator pubkey>, "impersonation"],
-    [ "p", <victim pubkey>]
+    ["p", <impersonator pubkey>, "impersonation"]
   ],
-  "content": "Profile is imitating #[1]",
+  "content": "Profile is impersonating nostr:<victim bech32 pubkey>",
   ...
 }
 ```
@@ -70,7 +74,7 @@ Client behavior
 ---------------
 
 Clients can use reports from friends to make moderation decisions if they
-choose to. For instance, if 3+ of your friends report a profile as explicit,
+choose to. For instance, if 3+ of your friends report a profile for `nudity`,
 clients can have an option to automatically blur photos from said account.
 
 
diff --git a/57.md b/57.md
index 39fa562..ace4a03 100644
--- a/57.md
+++ b/57.md
@@ -126,7 +126,7 @@ When receiving a payment, the following steps are executed:
 
 The following should be true of the `zap receipt` event:
 
-- The content SHOULD be empty.
+- 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`.
 - The `zap receipt` MUST have a `bolt11` tag containing the description hash bolt11 invoice.
diff --git a/65.md b/65.md
index 4c7a6a5..55f9ff0 100644
--- a/65.md
+++ b/65.md
@@ -10,7 +10,7 @@ A special replaceable event meaning "Relay List Metadata" is defined as an event
 
 The primary purpose of this relay list is to advertise to others, not for configuring one's client.
 
-The content is not used and SHOULD be an empty string.
+The `content` is not used and SHOULD be an empty string.
 
 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.
 
@@ -53,12 +53,12 @@ Authors may post events outside of the feed that they wish their followers to fo
 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
+  - 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.
+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
 
diff --git a/98.md b/98.md
new file mode 100644
index 0000000..ecbebc0
--- /dev/null
+++ b/98.md
@@ -0,0 +1,68 @@
+NIP-98
+======
+
+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 is useful for HTTP services which are build for Nostr and deal with Nostr user accounts.
+
+## Nostr event
+
+A `kind 27235` (In reference to [RFC 7235](https://www.rfc-editor.org/rfc/rfc7235)) event is used.
+
+The `content` SHOULD be empty.
+
+The following tags are defined as REQUIRED.
+
+* `u` - absolute URL
+* `method` - HTTP Request Method
+
+Example event:
+```json
+{
+    "id": "fe964e758903360f28d8424d092da8494ed207cba823110be3a57dfe4b578734",
+    "pubkey": "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
+    "content": "",
+    "kind": 27235,
+    "created_at": 1682327852,
+    "tags": [
+        [
+            "u",
+            "https://api.snort.social/api/v1/n5sp/list"
+        ],
+        [
+            "method",
+            "GET"
+        ]
+    ],
+    "sig": "5ed9d8ec958bc854f997bdc24ac337d005af372324747efe4a00e24f4c30437ff4dd8308684bed467d9d6be3e5a517bb43b1732cc7d33949a3aaf86705c22184"
+}
+```
+
+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).
+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.
+
+When the request contains a body (as in POST/PUT/PATCH methods) clients SHOULD include a SHA256 hash of the request body in a `payload` tag as hex (`["payload", "<sha256-hex>"]`), servers MAY check this to validate that the requested payload is authorized.
+
+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.
+
+## Request Flow
+
+Using the `Authorization` header, the `kind 27235` event MUST be `base64` encoded and use the Authorization scheme `Nostr`
+
+Example HTTP Authorization header:
+```
+Authorization: Nostr eyJpZCI6ImZlOTY0ZTc1ODkwMzM2MGYyOGQ4NDI0ZDA5MmRhODQ5NGVkMjA3Y2JhODIzMTEwYmUzYTU3ZGZlNGI1Nzg3MzQiLCJwdWJrZXkiOiI2M2ZlNjMxOGRjNTg1ODNjZmUxNjgxMGY4NmRkMDllMThiZmQ3NmFhYmMyNGEwMDgxY2UyODU2ZjMzMDUwNGVkIiwiY29udGVudCI6IiIsImtpbmQiOjI3MjM1LCJjcmVhdGVkX2F0IjoxNjgyMzI3ODUyLCJ0YWdzIjpbWyJ1cmwiLCJodHRwczovL2FwaS5zbm9ydC5zb2NpYWwvYXBpL3YxL241c3AvbGlzdCJdLFsibWV0aG9kIiwiR0VUIl1dLCJzaWciOiI1ZWQ5ZDhlYzk1OGJjODU0Zjk5N2JkYzI0YWMzMzdkMDA1YWYzNzIzMjQ3NDdlZmU0YTAwZTI0ZjRjMzA0MzdmZjRkZDgzMDg2ODRiZWQ0NjdkOWQ2YmUzZTVhNTE3YmI0M2IxNzMyY2M3ZDMzOTQ5YTNhYWY4NjcwNWMyMjE4NCJ9
+```
+
+## Reference Implementations
+- C# ASP.NET `AuthenticationHandler` [NostrAuth.cs](https://gist.github.com/v0l/74346ae530896115bfe2504c8cd018d3)
\ No newline at end of file
diff --git a/99.md b/99.md
new file mode 100644
index 0000000..274e5af
--- /dev/null
+++ b/99.md
@@ -0,0 +1,83 @@
+# NIP-99
+
+## Classified Listings
+
+`draft` `optional` `author:erskingardner`
+
+This NIP defines `kind:30402`: a parameterized replaceable event to describe classified listings that list any arbitrary product, service, or other thing for sale or offer and includes enough structured metadata to make them useful.
+
+The category of classifieds includes a very broad range of physical goods, services, work opportunities, rentals, free giveaways, personals, etc. and is distinct from the more strictly structured marketplaces defined in [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) that often sell many units of specific products through very specific channels.
+
+The structure of these events is very similar to [NIP-23](https://github.com/nostr-protocol/nips/blob/master/23.md) long-form content events.
+
+### Draft / Inactive Listings
+
+`kind:30403` has the same structure as `kind:30402` and is used to save draft or inactive classified listings.
+
+### Content
+
+The `.content` field should be a description of what is being offered and by whom. These events should be a string in Markdown syntax.
+
+### Author
+
+The `.pubkey` field of these events are treated as the party creating the listing.
+
+### Metadata
+
+- For "tags"/"hashtags" (i.e. categories or keywords of relevance for the listing) the `"t"` event tag should be used, as per [NIP-12](https://github.com/nostr-protocol/nips/blob/master/12.md).
+- For images, whether included in the markdown content or not, clients SHOULD use `image` tags as described in [NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md). This allows clients to display images in carousel format more easily.
+
+The following tags, used for structured metadata, are standardized and SHOULD be included. Other tags may be added as necessary.
+
+- `"title"`, a title for the listing
+- `"summary"`, for short tagline or summary for the listing
+- `"published_at"`, for the timestamp (in unix seconds – converted to string) of the first time the listing was published.
+- `"location"`, for the location.
+- `"price"`, for the price of the thing being listed. This is an array in the format `[ "price", "<number>", "<currency>", "<frequency>" ]`.
+  - `"price"` is the name of the tag
+  - `"<number>"` is the amount in numeric format (but included in the tag as a string)
+  - `"<currency>"` is the currency unit in 3-character ISO 4217 format or ISO 4217-like currency code (e.g. `"btc"`, `"eth"`).
+  - `"<frequency>"` is optional and can be used to describe recurring payments. SHOULD be in noun format (hour, day, week, month, year, etc.)
+
+#### `price` examples
+
+- $50 one-time payment `["price", "50", "USD"]`
+- €15 per month `["price", "15", "EUR", "month"]`
+- £50,000 per year `["price", "50000", "GBP", "year"]`
+
+Other standard tags that might be useful.
+
+- `"g"`, a geohash for more precise location
+
+## Example Event
+
+```json
+{
+  "kind": 30402,
+  "created_at": 1675642635,
+  // Markdown content
+  "content": "Lorem [ipsum][nostr:nevent1qqst8cujky046negxgwwm5ynqwn53t8aqjr6afd8g59nfqwxpdhylpcpzamhxue69uhhyetvv9ujuetcv9khqmr99e3k7mg8arnc9] dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\nRead more at nostr:naddr1qqzkjurnw4ksz9thwden5te0wfjkccte9ehx7um5wghx7un8qgs2d90kkcq3nk2jry62dyf50k0h36rhpdtd594my40w9pkal876jxgrqsqqqa28pccpzu.",
+  "tags": [
+    ["d", "lorem-ipsum"],
+    ["title", "Lorem Ipsum"],
+    ["published_at", "1296962229"],
+    ["t", "electronics"],
+    ["image", "https://url.to.img", "256x256"],
+    ["summary", "More lorem ipsum that is a little more than the title"],
+    ["location", "NYC"],
+    ["price", "100", "USD"],
+    [
+      "e",
+      "b3e392b11f5d4f28321cedd09303a748acfd0487aea5a7450b3481c60b6e4f87",
+      "wss://relay.example.com"
+    ],
+    [
+      "a",
+      "30023:a695f6b60119d9521934a691347d9f78e8770b56da16bb255ee286ddf9fda919:ipsum",
+      "wss://relay.nostr.org"
+    ]
+  ],
+  "pubkey": "...",
+  "id": "..."
+}
+```
diff --git a/README.md b/README.md
index a940ba6..1360190 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,13 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [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-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:` URL scheme](21.md)
+- [NIP-21: `nostr:` URI scheme](21.md)
 - [NIP-22: Event `created_at` Limits](22.md)
 - [NIP-23: Long-form Content](23.md)
 - [NIP-25: Reactions](25.md)
@@ -47,6 +47,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-28: Public Chat](28.md)
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
+- [NIP-32: Labeling](32.md)
 - [NIP-33: Parameterized Replaceable Events](33.md)
 - [NIP-36: Sensitive Content](36.md)
 - [NIP-39: External Identities in Profiles](39.md)
@@ -57,6 +58,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-47: Wallet Connect](47.md)
 - [NIP-50: Keywords filter](50.md)
 - [NIP-51: Lists](51.md)
+- [NIP-53: Live Activities](53.md)
 - [NIP-56: Reporting](56.md)
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)
@@ -64,6 +66,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-78: Application-specific data](78.md)
 - [NIP-89: Recommended Application Handlers](89.md)
 - [NIP-94: File Metadata](94.md)
+- [NIP-98: HTTP Auth](98.md)
+- [NIP-99: Classified Listings](99.md)
 
 ## Event Kinds
 
@@ -75,16 +79,19 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `3`     | Contacts                   | [2](02.md)  |
 | `4`     | Encrypted Direct Messages  | [4](04.md)  |
 | `5`     | Event Deletion             | [9](09.md)  |
-| `6`     | Reposts                    | [18](18.md) |
+| `6`     | Repost                     | [18](18.md) |
 | `7`     | Reaction                   | [25](25.md) |
 | `8`     | Badge Award                | [58](58.md) |
+| `16`    | Generic Repost             | [18](18.md) |
 | `40`    | Channel Creation           | [28](28.md) |
 | `41`    | Channel Metadata           | [28](28.md) |
 | `42`    | Channel Message            | [28](28.md) |
 | `43`    | Channel Hide Message       | [28](28.md) |
 | `44`    | Channel Mute User          | [28](28.md) |
 | `1063`  | File Metadata              | [94](94.md) |
+| `1311`  | Live Chat Message          | [53](53.md) |
 | `1984`  | Reporting                  | [56](56.md) |
+| `1985`  | Label                      | [32](32.md) |
 | `9734`  | Zap Request                | [57](57.md) |
 | `9735`  | Zap                        | [57](57.md) |
 | `10000` | Mute List                  | [51](51.md) |
@@ -95,6 +102,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `23194` | Wallet Request             | [47](47.md) |
 | `23195` | Wallet Response            | [47](47.md) |
 | `24133` | Nostr Connect              | [46](46.md) |
+| `27235` | HTTP Auth                  | [98](98.md) |
 | `30000` | Categorized People List    | [51](51.md) |
 | `30001` | Categorized Bookmark List  | [51](51.md) |
 | `30008` | Profile Badges             | [58](58.md) |
@@ -102,7 +110,11 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30017` | Create or update a stall   | [15](15.md) |
 | `30018` | Create or update a product | [15](15.md) |
 | `30023` | Long-form Content          | [23](23.md) |
+| `30024` | Draft Long-form Content    | [23](23.md) |
 | `30078` | Application-specific Data  | [78](78.md) |
+| `30311` | Live Event                 | [53](53.md) |
+| `30402` | Classified Listing         | [99](99.md) |
+| `30403` | Draft Classified Listing   | [99](99.md) |
 | `31989` | Handler recommendation     | [89](89.md) |
 | `31990` | Handler information        | [89](89.md) |
 
@@ -152,6 +164,9 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
 | `e`               | event id (hex)                       | relay URL, marker    | [1](01.md), [10](10.md)  |
 | `g`               | geohash                              | --                   | [12](12.md)              |
 | `i`               | identity                             | proof                | [39](39.md)              |
+| `k`               | kind number (string)                 | --                   | [18](18.md)              |
+| `l`               | label, label namespace               | annotations          | [32](32.md)              |
+| `L`               | label namespace                      | --                   | [32](32.md)              |
 | `p`               | pubkey (hex)                         | relay URL            | [1](01.md)               |
 | `r`               | a reference (URL, etc)               | --                   | [12](12.md)              |
 | `t`               | hashtag                              | --                   | [12](12.md)              |
@@ -162,13 +177,15 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
 | `delegation`      | pubkey, conditions, delegation token | --                   | [26](26.md)              |
 | `description`     | badge description                    | --                   | [58](58.md)              |
 | `description`     | invoice description                  | --                   | [57](57.md)              |
-| `emoji`           | shortcode                            | image URL            | [30](30.md)              |
+| `emoji`           | shortcode, image URL                 | --                   | [30](30.md)              |
 | `expiration`      | unix timestamp (string)              | --                   | [40](40.md)              |
 | `image`           | image URL                            | dimensions in pixels | [23](23.md), [58](58.md) |
 | `lnurl`           | `bech32` encoded `lnurl`             | --                   | [57](57.md)              |
+| `location`        | location string                      | --                   | [99](99.md)              |
 | `name`            | badge name                           | --                   | [58](58.md)              |
 | `nonce`           | random                               | --                   | [13](13.md)              |
 | `preimage`        | hash of `bolt11` invoice             | --                   | [57](57.md)              |
+| `price`           | price                                | currency, frequency  | [99](99.md)              |
 | `published_at`    | unix timestamp (string)              | --                   | [23](23.md)              |
 | `relay`           | relay url                            | --                   | [42](42.md)              |
 | `relays`          | relay list                           | --                   | [57](57.md)              |
@@ -186,6 +203,21 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
 4. There should be no more than one way of doing the same thing.
 5. Other rules will be made up when necessary.
 
+## Mailing Lists
+
+The nostr ecosystem is getting large with many different organizations, relays
+and clients. Following the nips repo on github is becoming more difficult and
+noisy. To coordinate on protocol development outside of github, there are
+mailing lists where you can work on NIPs before submitting them here:
+
+* [w3c nostr community group][w3-nostr] - [public-nostr@w3.org][mailto-w3] - requires signup
+* [nostr-protocol google group][nostr-google-group] - [nostr-protocol@googlegroups.com][mailto-google] - no signup required
+
+[w3-nostr]: https://www.w3.org/community/nostr/
+[mailto-w3]: mailto:public-nostr@w3.org
+[nostr-google-group]: https://groups.google.com/g/nostr-protocol
+[mailto-google]: mailto:nostr-protocol@googlegroups.com
+
 ## License
 
 All NIPs are public domain.