diff --git a/dev/dev-scenarios.nix b/dev/dev-scenarios.nix
index 37b1744..21f5991 100644
--- a/dev/dev-scenarios.nix
+++ b/dev/dev-scenarios.nix
@@ -37,7 +37,7 @@ with lib;
         extraConfig.Settings.themeColor = "INDIGO";
       };
       # nodes.lnd.enable = false;
-      # services.rtl.nodes.reverseOrder = true;
+      # nodes.reverseOrder = true;
       nightTheme = true;
       extraCurrency = "CHF";
     };
diff --git a/examples/README.md b/examples/README.md
index d7c9d39..6825c94 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -23,9 +23,9 @@ cd nix-bitcoin/examples/
 nix-shell
 ```
 
-The following example scripts set up a nix-bitcoin node according to [`configuration.nix`](configuration.nix) and then
+The following example scripts set up a nix-bitcoin node according to [`./configuration.nix`](configuration.nix) and then
 shut down immediately. They leave no traces (outside of `/nix/store`) on the host system.\
-By default, [`configuration.nix`](configuration.nix) enables `bitcoind` and `clightning`.
+By default, [`./configuration.nix`](configuration.nix) enables `bitcoind` and `clightning`.
 
 - [`./deploy-container.sh`](deploy-container.sh) creates a [NixOS container](https://github.com/erikarvstedt/extra-container).\
   This is the fastest way to set up a node.\
diff --git a/examples/configuration.nix b/examples/configuration.nix
index 5db7bb9..5406e78 100644
--- a/examples/configuration.nix
+++ b/examples/configuration.nix
@@ -230,6 +230,12 @@
   # Set this to enable the JoinMarket order book watcher.
   # services.joinmarket-ob-watcher.enable = true;
 
+  ### Nodeinfo
+  # Set this to add command `nodeinfo` to the system environment.
+  # It shows info about running services like onion addresses and local addresses.
+  # It is enabled by default when importing `secure-node.nix`.
+  # nix-bitcoin.nodeinfo.enable = true;
+
   ### Backups
   # Set this to enable nix-bitcoin's own backup service. By default, it
   # uses duplicity to incrementally back up all important files in /var/lib to
diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix
index a639d0f..32ee7c9 100644
--- a/examples/qemu-vm/minimal-vm.nix
+++ b/examples/qemu-vm/minimal-vm.nix
@@ -40,10 +40,11 @@ rec {
 
         Welcome to nix-bitcoin!
         To explore running services, try the following commands:
-        - nodeinfo
-        - systemctl status bitcoind
-        - systemctl status clightning
-        - lightning-cli getinfo
+          nodeinfo
+          systemctl status bitcoind
+          systemctl status clightning
+          bitcoin-cli -getinfo
+          lightning-cli getinfo
       '';
 
       # Power off VM when the user exits the shell
diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix
index be3e7b4..55540d3 100644
--- a/modules/secrets/secrets.nix
+++ b/modules/secrets/secrets.nix
@@ -80,6 +80,7 @@ let
         rpcauth = pkgs.writers.writeBash "rpcauth" ''
           exec ${pkgs.python3}/bin/python ${rpcauthSrc} "$@"
         '';
+      # Writes secrets to PWD
       in pkgs.writers.writeBash "generate-secrets" ''
         set -euo pipefail
 
diff --git a/test/nixos-search/flake-info-sandboxed.sh b/test/nixos-search/flake-info-sandboxed.sh
index 2b664e0..2bf6bb8 100755
--- a/test/nixos-search/flake-info-sandboxed.sh
+++ b/test/nixos-search/flake-info-sandboxed.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Run flake-info for the nix-bitcoin flake in a sandbox:
+# Run flake-info for the nix-bitcoin flake in an offline sandbox:
 # - Adds a consistent, reproducible runtime environment
 # - Removes the need to trust the flake-info binary
 #