diff --git a/doc/lightning-connect.7.md b/doc/lightning-connect.7.md
index 02a85f1c0..e596f7a76 100644
--- a/doc/lightning-connect.7.md
+++ b/doc/lightning-connect.7.md
@@ -42,7 +42,7 @@ RETURN VALUE
 [comment]: # (GENERATE-FROM-SCHEMA-START)
 On success, an object is returned, containing:
 - **id** (pubkey): the peer we connected to
-- **features** (hex): BOLT 9 features bitmap offered by peer
+- **features** (hex): BOLT 9 features bitmap offered by peer in init message (globalfeatures and features combined)
 - **direction** (string): Whether they initiated connection or we did (one of "in", "out")
 - **address** (object): Address information (mainly useful if **direction** is *out*):
   - **type** (string): Type of connection (*torv2*/*torv3* only if **direction** is *out*) (one of "local socket", "ipv4", "ipv6", "torv2", "torv3")
diff --git a/doc/lightning-getinfo.7.md b/doc/lightning-getinfo.7.md
index c7150e41b..20f8be1d8 100644
--- a/doc/lightning-getinfo.7.md
+++ b/doc/lightning-getinfo.7.md
@@ -128,4 +128,4 @@ RESOURCES
 ---------
 
 Main web site: <https://github.com/ElementsProject/lightning>
-[comment]: # ( SHA256STAMP:041768347542d7cf4260739ad8934c77d52682d089d9fe07499e22f7331b53f5)
+[comment]: # ( SHA256STAMP:f7c85915ae8da7e9cabd2c72a31157801524b53f6bf8463da1743a0ee71e7c88)
diff --git a/doc/lightning-listchannels.7.md b/doc/lightning-listchannels.7.md
index 7c9063840..5113ba6f5 100644
--- a/doc/lightning-listchannels.7.md
+++ b/doc/lightning-listchannels.7.md
@@ -45,7 +45,7 @@ On success, an object containing **channels** is returned.  It is an array of ob
 - **fee_per_millionth** (u32): Proportional fee changed by *source* to use this channel, in parts-per-million
 - **delay** (u32): The number of blocks delay required by *source* to use this channel
 - **htlc_minimum_msat** (msat): The smallest payment *source* will allow via this channel
-- **features** (hex): BOLT #9 features bitmap for this channel
+- **features** (hex): BOLT #9 features bitmap for this channel in channel_announcement message
 - **htlc_maximum_msat** (msat, optional): The largest payment *source* will allow via this channel
 
 [comment]: # (GENERATE-FROM-SCHEMA-END)
diff --git a/doc/lightning-listnodes.7.md b/doc/lightning-listnodes.7.md
index b386c5669..314530684 100644
--- a/doc/lightning-listnodes.7.md
+++ b/doc/lightning-listnodes.7.md
@@ -34,7 +34,7 @@ On success, an object containing **nodes** is returned.  It is an array of objec
 If **last_timestamp** is present:
   - **alias** (string): The fun alias this node advertized (up to 32 characters)
   - **color** (hex): The favorite RGB color this node advertized (always 6 characters)
-  - **features** (hex): BOLT #9 features bitmap this node advertized
+  - **features** (hex): BOLT #9 features bitmap this node advertized in node_announcement message
   - **addresses** (array of objects): The addresses this node advertized:
     - **type** (string): Type of connection (one of "dns", "ipv4", "ipv6", "torv2", "torv3", "websocket")
     - **port** (u16): port number
diff --git a/doc/lightningd-config.5.md b/doc/lightningd-config.5.md
index 80e633071..879606f2e 100644
--- a/doc/lightningd-config.5.md
+++ b/doc/lightningd-config.5.md
@@ -124,7 +124,8 @@ Specify pid file to write to.
  **log-level**=*LEVEL*\[:*SUBSYSTEM*\]
 What log level to print out: options are io, debug, info, unusual,
 broken.  If *SUBSYSTEM* is supplied, this sets the logging level
-for any subsystem containing that string.  Subsystems include:
+for any subsystem containing that string. This option may be specified multiple times.
+Subsystems include:
 
 * *lightningd*: The main lightning daemon
 * *database*: The database subsystem
@@ -497,8 +498,11 @@ considered important.
 
 Experimental options are subject to breakage between releases: they
 are made available for advanced users who want to test proposed
-features.  If lightningd is built configured with
-`--enable-experimental-features` these are on by default.
+features. When the build is configured _without_ `--enable-experimental-features`,
+below options are available but disabled by default.
+A build _with_ `--enable-experimental-features` enables some of below options
+by default and also adds support for even more features. Supported features can
+be listed with `lightningd --list-features-only`.
 
  **experimental-onion-messages**
 
diff --git a/gossipd/gossip_generation.c b/gossipd/gossip_generation.c
index eb25ce880..ae1d7d851 100644
--- a/gossipd/gossip_generation.c
+++ b/gossipd/gossip_generation.c
@@ -46,8 +46,7 @@ static u8 *create_node_announcement(const tal_t *ctx, struct daemon *daemon,
 
 	announcement =
 	    towire_node_announcement(ctx, sig,
-				     daemon->our_features->bits
-				     [NODE_ANNOUNCE_FEATURE],
+				     daemon->our_features->bits[NODE_ANNOUNCE_FEATURE],
 				     timestamp,
 				     &daemon->id, daemon->rgb, daemon->alias,
 				     addresses,