From a0e39789276196447a12db6ceb5897f8b62923d2 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 08:15:04 +0200
Subject: [PATCH 01/18] add legal forum to faq

---
 documentation/operators/src/faq/smoosh-faq.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/documentation/operators/src/faq/smoosh-faq.md b/documentation/operators/src/faq/smoosh-faq.md
index b9683dc7d3..ae0f763464 100644
--- a/documentation/operators/src/faq/smoosh-faq.md
+++ b/documentation/operators/src/faq/smoosh-faq.md
@@ -74,9 +74,7 @@ From an operator standpoint, it shall just be a standard Nym upgrade, a new opti
 
 ### Are there any legal concerns for the operators?
 
-So far the general line is running a gateway is not illegal (unless you are in Iran, China, and a few other places) and due to encryption/mixing less risky than running a normal VPN node. For mix nodes, its very safe as they have no idea what packets they are mixing.  
+So far the general line is running a gateway is not illegal (unless you are in Iran, China, and a few other places) and due to encryption/mixing less risky than running a normal VPN node. For mix nodes, its very safe as they have "no idea" what packets they are mixing.  
 
-There are several legal questions regarding to this and we would like to ask you to fill this [short survey](https://nymtech.typeform.com/exitnode).
-
-We'll have a thorough legal analysis out before hand and various resources from and for the community. <!-- which we started to gather in the [Community Legal Forum](../legal/legal-forum.md). Uncomment when the legal forum get's merged -->
+There are several legal questions regarding to this and analysis to be made for different jurisdictions. To be able to share resources and findings between the operators themselves we created a [Community Legal Forum](../legal/exit-gateway.md). 
 

From 6bff864444f21925959159e0c27780403426a498 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 08:24:40 +0200
Subject: [PATCH 02/18] add how to make legal PR

---
 documentation/operators/src/legal/exit-gateway.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/documentation/operators/src/legal/exit-gateway.md b/documentation/operators/src/legal/exit-gateway.md
index fb73e7f8f0..e011cc01e3 100644
--- a/documentation/operators/src/legal/exit-gateway.md
+++ b/documentation/operators/src/legal/exit-gateway.md
@@ -202,4 +202,11 @@ git add <FILE_NAME>.md
 git commit -am "<describe your changes>"
 git push origin operators/legal-forum/<MY_BRANCH_NAME>
 ```
-7. Notify others in the [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat)
+7. Open the git generated link in your browser, fill the description and click on `Create a Pull Request` button
+```sh
+# The link will look like this
+ https://github.com/nymtech/nym/pull/new/<MY_BRANCH_NAME>
+```
+8. Notify others in the [Node Operators Legal Forum](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org) (Matrix chat)
+
+

From b5ca5b4417de002f274daf30f76655ae76903464 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:11:17 +0200
Subject: [PATCH 03/18] add exit gateway options

---
 .../operators/src/nodes/gateway-setup.md      | 78 ++++++++++++++++++-
 .../operators/src/nodes/maintenance.md        | 10 +--
 2 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 5a880c4ece..76412d55c4 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -9,6 +9,8 @@
 <!-- cmdrun ../../../../target/release/nym-gateway --version | grep "Build Version" | cut -b 21-26  -->
 ```
 
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off byt the operator, to set the gateway as an exit node. More info on these changes [below](). 
+
 ## Preliminary steps
 
 Make sure you do the preparation listed in the [preliminary steps page](../preliminary-steps.md) before setting up your gateway.
@@ -56,22 +58,90 @@ To check available configuration options use:
 ```
 ~~~
 
-The following command returns a gateway on your current IP with the `id` of `supergateway`:
+The following command returns a gateway on your current IP with the `<ID>` of `supergateway`:
 
 ```
-./nym-gateway init --id supergateway --host $(curl ifconfig.me) --wallet-address n1eufxdlgt0puwrwptgjfqne8pj4nhy2u5ft62uq
+./nym-gateway init --id supergateway --host $(curl ifconfig.me)
 ```
 
 ~~~admonish example collapsible=true title="Console output"
 ```
-<!-- cmdrun ../../../../target/release/nym-gateway init --id supergateway --host $(curl ifconfig.me) --wallet-address n1eufxdlgt0puwrwptgjfqne8pj4nhy2u5ft62uq -->
+<!-- cmdrun ../../../../target/release/nym-gateway init --id supergateway --host $(curl ifconfig.me) -->
 ```
 ~~~
 
 The `$(curl ifconfig.me)` command above returns your IP automatically using an external service. Alternatively, you can enter your IP manually if you wish. If you do this, remember to enter your IP **without** any port information.
 
+
+#### Initialising gateway with network requester
+
+As some of the [Project Smoosh](../faq/smoosh-faq.md) changes getting implemented, the gateways now can work also as a network requesters at the same time. Such combination creates an exit gateway node, needed for new more open setup. 
+
+An operator can initialise the gateway and network requester together by running:
+
+```
+./nym-gateway init --id <ID> --host $(curl ifconfig.me) --with-network-requester
+```
+
+If we follow the previous example with `<ID>` chosen `supergateway`, adding the `--with-network-requester` flag, the outcome will be:
+
+
+~~~admonish example collapsible=true title="Console output"
+```
+<!-- cmdrun ../../../../target/release/nym-gateway init --id supergateway --host $(curl ifconfig.me) --with-network-requester -->
+```
+~~~
+
+You can see that the printed information besides identity and sphinx keys also includes a long string called address. This is the addressto be provided to your local [socks5 client](https://nymtech.net/docs/clients/socks5-client.html) as a `--provider` if you wish to connect to your own exit gateway.  
+
+#### Add network requester to existing gateway
+
+If you already have a gateway and got it [upgraded](./maintenance.md#upgrading-your-node) to the [newest version](./gateway-setup.md#current-version), you can easily add a network requester by stopping your gateway and running a command `setup-network-requester`.
+
+See the options:
+
+```
+./nym-gateway setup-network-requester --help
+```
+
+~~~admonish example collapsible=true title="Console output"
+```
+<!-- cmdrun ../../../../target/release/nym-gateway setup-network-requester --help -->
+```
+~~~
+
+Run with `--enabled true` flag (using same placeholders like above):
+
+```
+./nym-gateway setup-network-requester --enabled true --id supergateway --host $(curl ifconfig.me)
+```
+
+~~~admonish example collapsible=true title="Console output"
+```
+<!-- cmdrun ../../../../target/release/nym-gateway setup-network-requester --enabled true --id supergateway --host $(curl ifconfig.me)-->
+```
+~~~
+
+In case there are any problems, you can also change it manually by editing the gateway config stored in `/home/user/.nym/gateways/<ID>/config/config.toml` where the line under `[network_requester]` needs to be edited from `false` to `true`, it shall look like this:  
+
+```
+[network_requester]
+# Specifies whether network requester service is enabled in this process.
+enabled = true
+```
+
+Save, exit and restart your gateway.
+
+All information about your network requester connected to your gateway is in `/home/user/.nym/gateways/snus/config/network_requester_config.toml`.
+
+```admonish info
+Before you bond and run your gateway, please make sure the [firewall configuration](./maintenance.md#configure-your-firewall) is setup so your gateway can be reached from the outside.
+```
+
 ### Bonding your gateway
+
 #### Via the Desktop wallet
+
 You can bond your gateway via the Desktop wallet.
 
 1. Open your wallet, and head to the `Bonding` page, then select the node type `Gateway` and input your node details (Location format is <CITY>, <COUNTRY>). Press `Next`
@@ -81,7 +151,7 @@ You can bond your gateway via the Desktop wallet.
 3. You will be asked to run a the `sign` command with your `gateway` - copy and paste the long signature as the value of `--contract-msg` and run it. 
 
 ```
-./nym-mixnode sign --id <YOUR_ID> --contract-msg <PAYLOAD_GENERATED_BY_THE_WALLET>
+./nym-gatewway sign --id <YOUR_ID> --contract-msg <PAYLOAD_GENERATED_BY_THE_WALLET>
 ```
 
 It will look something like this:
diff --git a/documentation/operators/src/nodes/maintenance.md b/documentation/operators/src/nodes/maintenance.md
index e29b80eb25..03bb33a0f3 100644
--- a/documentation/operators/src/nodes/maintenance.md
+++ b/documentation/operators/src/nodes/maintenance.md
@@ -152,14 +152,8 @@ sudo ufw status
 Finally open your `<NODE>` p2p port, as well as ports for ssh and ports for verloc and measurement pings:
 
 ```sh
-# for mix node
-sudo ufw allow 1789,1790,8000,22/tcp
-
-# for gateway
-sudo ufw allow 1789,22,9000/tcp
-
-# for network requester
-sudo ufw allow 22,9000/tcp
+# for mix node, gateway and network requester
+sudo ufw allow 1789,1790,8000,9000,22/tcp
 
 # for validator
 sudo ufw allow 1317,26656,26660,22,80,443/tcp

From c41872d5a412bb480fb3415e66bf5ccf07dced69 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:15:34 +0200
Subject: [PATCH 04/18] finish gateway doc updates

---
 documentation/operators/src/nodes/gateway-setup.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 76412d55c4..3861af8e7b 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -144,7 +144,7 @@ Before you bond and run your gateway, please make sure the [firewall configurati
 
 You can bond your gateway via the Desktop wallet.
 
-1. Open your wallet, and head to the `Bonding` page, then select the node type `Gateway` and input your node details (Location format is <CITY>, <COUNTRY>). Press `Next`
+1. Open your wallet, and head to the `Bonding` page, then select the node type `Gateway` and input your node details. Press `Next`
 
 2. Enter the `Amount`, `Operating cost` and press `Next`.
 
@@ -158,7 +158,7 @@ It will look something like this:
 
 ~~~admonish example collapsible=true title="Console output"
 ```
-./nym-gateway sign --id upgrade_test --contract-msg 2Mf8xYytgEeyJke9LA7TjhHoGQWNBEfgHZtTyy2krFJfGHSiqy7FLgTnauSkQepCZTqKN5Yfi34JQCuog9k6FGA2EjsdpNGAWHZiuUGDipyJ6UksNKRxnFKhYW7ri4MRduyZwbR98y5fQMLAwHne1Tjm9cXYCn8McfigNt77WAYwBk5bRRKmC34BJMmWcAxphcLES2v9RdSR68tkHSpy2C8STfdmAQs3tZg8bJS5Qa8pQdqx14TnfQAPLk3QYCynfUJvgcQTrg29aqCasceGRpKdQ3Tbn81MLXAGAs7JLBbiMEAhCezAr2kEN8kET1q54zXtKz6znTPgeTZoSbP8rzf4k2JKHZYWrHYF9JriXepuZTnyxAKAxvGFPBk8Z6KAQi33NRQkwd7MPyttatHna6kG9x7knffV6ebGzgRBf7NV27LurH8x4L1uUXwm1v1UYCA1WSBQ9Pp2JW69k5v5v7G9gBy8RUcZnMbeL26Qqb8WkuGcmuHhaFfoqSfV7PRHPpPT4M8uRqUyR4bjUtSJJM1yh6QSeZk9BEazzoJqPeYeGoiFDZ3LMj2jesbJweQR4caaYuRczK92UGSSqu9zBKmE45a
+./nym-gateway sign --id supergateway --contract-msg 2Mf8xYytgEeyJke9LA7TjhHoGQWNBEfgHZtTyy2krFJfGHSiqy7FLgTnauSkQepCZTqKN5Yfi34JQCuog9k6FGA2EjsdpNGAWHZiuUGDipyJ6UksNKRxnFKhYW7ri4MRduyZwbR98y5fQMLAwHne1Tjm9cXYCn8McfigNt77WAYwBk5bRRKmC34BJMmWcAxphcLES2v9RdSR68tkHSpy2C8STfdmAQs3tZg8bJS5Qa8pQdqx14TnfQAPLk3QYCynfUJvgcQTrg29aqCasceGRpKdQ3Tbn81MLXAGAs7JLBbiMEAhCezAr2kEN8kET1q54zXtKz6znTPgeTZoSbP8rzf4k2JKHZYWrHYF9JriXepuZTnyxAKAxvGFPBk8Z6KAQi33NRQkwd7MPyttatHna6kG9x7knffV6ebGzgRBf7NV27LurH8x4L1uUXwm1v1UYCA1WSBQ9Pp2JW69k5v5v7G9gBy8RUcZnMbeL26Qqb8WkuGcmuHhaFfoqSfV7PRHPpPT4M8uRqUyR4bjUtSJJM1yh6QSeZk9BEazzoJqPeYeGoiFDZ3LMj2jesbJweQR4caaYuRczK92UGSSqu9zBKmE45a
 
 
       _ __  _   _ _ __ ___

From c3ffadf53f5fce9e10b9d66950a1c26600d12632 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:22:05 +0200
Subject: [PATCH 05/18] update network requester smooshed setup

---
 .../operators/src/nodes/gateway-setup.md      |  14 +--
 .../src/nodes/network-requester-setup.md      | 118 ++++--------------
 2 files changed, 28 insertions(+), 104 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 3861af8e7b..34b55f4716 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -9,7 +9,7 @@
 <!-- cmdrun ../../../../target/release/nym-gateway --version | grep "Build Version" | cut -b 21-26  -->
 ```
 
-As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off byt the operator, to set the gateway as an exit node. More info on these changes [below](). 
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off byt the operator, to set the gateway as an exit node. More info on these changes [below](./gateway-setup.md#initialising-gateway-with-network-requester). 
 
 ## Preliminary steps
 
@@ -83,12 +83,12 @@ An operator can initialise the gateway and network requester together by running
 ./nym-gateway init --id <ID> --host $(curl ifconfig.me) --with-network-requester
 ```
 
-If we follow the previous example with `<ID>` chosen `supergateway`, adding the `--with-network-requester` flag, the outcome will be:
+If we follow the previous example with `<ID>` chosen `superexitgateway`, adding the `--with-network-requester` flag, the outcome will be:
 
 
 ~~~admonish example collapsible=true title="Console output"
 ```
-<!-- cmdrun ../../../../target/release/nym-gateway init --id supergateway --host $(curl ifconfig.me) --with-network-requester -->
+<!-- cmdrun ../../../../target/release/nym-gateway init --id superexitgateway --host $(curl ifconfig.me) --with-network-requester -->
 ```
 ~~~
 
@@ -110,15 +110,15 @@ See the options:
 ```
 ~~~
 
-Run with `--enabled true` flag (using same placeholders like above):
+Run with `--enabled true` flag chosing `<ID>` as `supergateway`:
 
 ```
-./nym-gateway setup-network-requester --enabled true --id supergateway --host $(curl ifconfig.me)
+./nym-gateway setup-network-requester --enabled true --id supergateway 
 ```
 
 ~~~admonish example collapsible=true title="Console output"
 ```
-<!-- cmdrun ../../../../target/release/nym-gateway setup-network-requester --enabled true --id supergateway --host $(curl ifconfig.me)-->
+<!-- cmdrun ../../../../target/release/nym-gateway setup-network-requester --enabled true --id supergateway -->
 ```
 ~~~
 
@@ -198,7 +198,7 @@ If you want to bond your mix node via the CLI, then check out the [relevant sect
 The `run` command starts the gateway:
 
 ```
-./nym-gateway run --id <YOUR_ID>
+./nym-gateway run --id <ID>
 ```
 ## Maintenance
 
diff --git a/documentation/operators/src/nodes/network-requester-setup.md b/documentation/operators/src/nodes/network-requester-setup.md
index 640f103a65..ff94054657 100644
--- a/documentation/operators/src/nodes/network-requester-setup.md
+++ b/documentation/operators/src/nodes/network-requester-setup.md
@@ -1,6 +1,10 @@
 # Network Requesters
 
-> The Nym gateway was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
+> The Nym network requester was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
+
+```admonish info
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-network-requester` can be ran as a part of [`nym-gateway`](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators to start shifting to that model instead of running gateway and network requester as two separated binaries.
+```
 
 > Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
 
@@ -14,10 +18,13 @@
 Make sure you do the preparation listed in the [preliminary steps page](../preliminary-steps.md) before setting up your network requester.
 
 ## Network Requester Whitelist
+
 If you have access to a server, you can run the network requester, which allows Nym users to send outbound requests from their local machine through the mixnet to a server, which then makes the request on their behalf, shielding them (and their metadata) from clearnet, untrusted and unknown infrastructure, such as email or message client servers.
 
 By default the network requester is **not** an open proxy (although it can be used as one). It uses a file called `allowed.list` (located in `~/.nym/service-providers/network-requester/<NETWORK-REQUESTER-ID>/`) as a whitelist for outbound requests.
 
+**Note:** If you run network requester as a part of the gateway the `allowed.list` will be stored in `~/.nym/gateways/snus/data/network-requester-data/allowed.list`.
+
 Any request to a URL which is not on this list will be blocked.
 
 On startup, if this file is not present, the requester will grab the default whitelist from [Nym's default list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) automatically.
@@ -100,12 +107,17 @@ alephium.org
 ```
 
 ## Network Requester Directory
+
 You can find a list of Network requesters running the default whitelist in the [explorer](https://explorer.nymtech.net/network-components/service-providers). This list comprises of the NRs running as infrastructure for NymConnect.
 
 > We are currently working on a smart-contract based solution more in line with how Mix nodes and Gateways announce themselves to the network.
 
 ## Viewing command help
 
+```admonish info
+If you run your network requester as a part of your gateway according to the suggested setup, please skip the rest of this page and read about [exit gateway setup](./gateway-setup.md#initialising-gateway-with-network-requester).
+```
+
 To begin, move to `/target/release` directory from which you run the node commands:
 
 ```
@@ -151,102 +163,11 @@ Now that we have initialized our network-requester, we can start it with the fol
  ./nym-network-requester run --id <YOUR_ID>
 ```
 
-## Maintenance
-
-For network requester upgrade (including an upgrade from `<v1.1.9` to `>= v1.1.10`), firewall setup, port configuration, API endpoints, VPS suggestions, automation and more, see the [maintenance page](./maintenance.md).
-
-### Upgrading to >= v1.1.10 from <v1.1.9
-
-In the previous version of the network-requester, users were required to run a nym-client along side it to function. As of `v1.1.10`, the network-requester now has a nym client embedded into the binary, so it can run standalone.
-
-If you are running an existing network requester registered with nym-connect, upgrading requires you move your old keys over to the new network requester configuration. We suggest following these instructions carefully to ensure a smooth transition.
-
-Initiate the new network requester:
-
-```
-nym-network-requester init --id mynetworkrequester
-```
-
-Copy the old keys from your client to the network-requester configuration that was created above:
-
-```
-cp -vr ~/.nym/clients/myoldclient/data/* ~/.nym/service-providers/network-requester/mynetworkrequester/data
-```
-
-Edit the gateway configuration to match what you used on your client. Specifically, edit the configuration file at:
-
-```
-~/.nym/service-providers/network-requester/mynetworkrequester/config/config.toml
-```
-
-Ensure that the fields `gateway_id`, `gateway_owner`, `gateway_listener` in the new config match those in the old client config at:
-
-```
-~/.nym/clients/myoldclient/config/config.toml
-```
-
-## Automating your network requester with systemd
-Stop the running process with `CTRL-C`, and create a service file for the requester as we did with our client instance previously at `/etc/systemd/system/nym-network-requester.service`:
-
-```ini
-[Unit]
-Description=Nym Network Requester 
-StartLimitInterval=350
-StartLimitBurst=10
-
-[Service]
-User=nym # replace this with whatever user you wish
-LimitNOFILE=65536
-# remember to add the `--enable-statistics` flag if running as part of a service grant and check the path to your nym-network-requester binary
-ExecStart=/home/nym/nym-network-requester run --id <your_id>
-KillSignal=SIGINT
-Restart=on-failure
-RestartSec=30
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Now enable and start your requester:
-
-```
-systemctl enable nym-network-requester.service
-systemctl start nym-network-requester.service
-
-# you can always check your requester has succesfully started with:
-systemctl status nym-network-requester.service
-```
-
-## VPS Setup
-### Configure your firewall
-Although your requester is now ready to receive traffic, your server may not be - the following commands will allow you to set up a properly configured firewall using `ufw`:
-
-```
-# check if you have ufw installed
-ufw version
-# if it is not installed, install with
-sudo apt install ufw -y
-# enable ufw
-sudo ufw enable
-# check the status of the firewall
-sudo ufw status
-```
-
-Finally open your requester's ssh port to incoming administration connections:
-
-```
-sudo ufw allow 22/tcp
-# check the status of the firewall
-sudo ufw status
-```
->>>>>>> release/v1.1.27:documentation/docs/src/nodes/network-requester-setup.md
->>>>>>> 85ab634d9c1f1f54073c97a133c83e645a0a3f41
-
 ## Using your network requester
 
 The next thing to do is use your requester, share its address with friends (or whoever you want to help privacy-enhance their app traffic). Is this safe to do? If it was an open proxy, this would be unsafe, because any Nym user could make network requests to any system on the internet.
 
-To make things a bit less stressful for administrators, the Network Requester drops all incoming requests by default. In order for it to make requests, you need to add specific domains to the `allowed.list` file at `$HOME/.nym/service-providers/network-requester/allowed.list`.
+To make things a bit less stressful for administrators, the Network Requester drops all incoming requests by default. In order for it to make requests, you need to add specific domains to the `allowed.list` file at `$HOME/.nym/service-providers/network-requester/allowed.list` or if network requester is ran from the [gateway binary](./gateway-setup.md#initialising-gateway-with-network-requester), the `allowed.list` will be stored in `~/.nym/gateways/<ID>/data/network-requester-data/allowed.list`
 
 ### Global vs local allow lists 
 Your Network Requester will check for a domain against 2 lists before allowing traffic through for a particular domain or IP. 
@@ -263,12 +184,16 @@ It is easy to add new domains and services to your network requester - simply fi
 How to go about this? Have a look in your nym-network-requester config directory:
 
 ```
+# network requester binary
 ls -lt $HOME/.nym/service-providers/network-requester/*/data | grep "list"
 
+# gateway with network requester binary
+ls -lt $HOME/.nym/gateways/*/data/network-requester-data | grep "list"
+
 # returns: allowed.list  unknown.list
 ```
 
-We already know that `allowed.list` is what lets requests go through. All unknown requests are logged to `unknown.list`. If you want to try using a new client type, just start the new application, point it at your local [socks client](https://nymtech.net/docs/clients/socks5-client.html) (configured to use your remote `nym-network-requester`), and keep copying URLs from `unknown.list` into `allowed.list` (it may take multiple tries until you get all of them, depending on the complexity of the application). Make sure to restart your network requester!
+We already know that `allowed.list` is what lets requests go through. All unknown requests are logged to `unknown.list`. If you want to try using a new client type, just start the new application, point it at your local [socks client](https://nymtech.net/docs/clients/socks5-client.html) (configured to use your remote `nym-network-requester`), and keep copying URLs from `unknown.list` into `allowed.list` (it may take multiple tries until you get all of them, depending on the complexity of the application). Make sure to delete the copied ones in 'unknown.list' and restart your network requester or gateway with network requester!
 
 > If you are adding custom domains, please note that whilst they may appear in the logs of your network-requester as something like `api-0.core.keybaseapi.com:443`, you **only need** to include the main domain name, in this instance `keybaseapi.com`
 
@@ -292,8 +217,7 @@ This command should return the following:
 { "status": "ok" }
 ```
 
+## Maintenance
 
-## Ports
-### Requester port reference
+For network requester upgrade (including an upgrade from `<v1.1.9` to `>= v1.1.10`), firewall setup, port configuration, API endpoints, VPS suggestions, automation and more, see the [maintenance page](./maintenance.md).
 
-All network-requester-specific port configuration can be found in `$HOME/.nym/service-providers/network-requester/<YOUR_ID>/config/config.toml`. If you do edit any port configs, remember to restart your client and requester processes.

From bbb6919bf1798e9b5b2b999b942872efe7103f1a Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:31:11 +0200
Subject: [PATCH 06/18] delete old troubleshooting stuff

---
 .../operators/src/nodes/troubleshooting.md    | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index 20b98970df..a46332094b 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -236,7 +236,7 @@ Here is a sample of the `init` command example to create the mix node config.
 ./nym-mixnode init --id <YOUR_ID> --host 0.0.0.0 --announce-host 85.160.12.13
 ```
 
-- `--host 0.0.0.0` should work every time even if your local machine IPv4 address changes. For example on Monday your router gives your machine an address `192.168.0.13` and on Wednesday, the DHCP lease will end and you will be assigned `192.168.0.14`. Using `0.0.0.0` should avoid this without having to set any static IP in your router`s configuration.
+- `--host 0.0.0.0` should work every time even if your local machine IPv4 address changes. For example on Monday your router gives your machine an address `192.168.0.13` and on Wednesday, the DHCP lease will end and you will be assigned `192.168.0.14`. Using `0.0.0.0` should avoid this without having to set any static IP in your router's configuration.
 
 - you can get your current IPv4 address by either using `curl ipinfo.io` if you're on MacOS or Linux or visiting [whatsmyip site](https://www.whatsmyip.org/). Simply copy it and use it as `--anounce-host` address.
 
@@ -262,23 +262,6 @@ thread 'tokio-runtime-worker' panicked at 'Failed to create TCP listener: Os { c
 
 Then you need to `--announce-host <PUBLIC_IP>` and `--host <LOCAL_IP>` on startup. This issue is addressed [above](./troubleshooting.md#missing-`announce-host`-flag)
 
-<!--- Commenting for now:
-
-#### `rocket::launch` warnings
-These warnings are not an issue, please ignore them. Rocket is a web framework for rust which we are using to provide mixnodes with `/verloc` and `/description` http APIs.
-
-Find more information about this in the [Mixnodes metrics documentation](./maintenance.md#metrics--api-endpoints).
-
-Rocket runs on port `8000` by default. Although at this stage we need Rocket to be reachable via this port, in the future customization of the particular port it uses will be possible.
-
-#### `failed to receive reply to our echo packet within 1.5s. Stopping the test`
-
-This relates to the VerLoc implementation that appeared in `0.10.1`, which has a particularly high log sensitivity. This warning means that the echo packet sent to the mix node was received, but not sent back. _This will not affect the rate of rewards or performance metrics of your mix node in the testnet at this point._
-
-#### `Connection to <IP>:1789 seems to be dead`
-
-This warning is normal at the moment, and is _nothing to do with your mix node!_ It is simply a warning that your node is unable to connect to other peoples' mixnodes for some reason, most likely because they are offline or poorly configured.
---->
 ### Can I use a port other than 1789 ?
 
 Yes! Here is what you will need to do:
@@ -312,6 +295,12 @@ Finally, restart your node. You should see if the mix node is using the port you
 
 You don't have to do any additional configuration for your node to implement this, it is a passive process that runs in the background of the mixnet from version `0.10.1` onward.
 
+## Gateways & Network requesters
+
+### My gateway seems to be running but appears offline
+
+Check if your [firewall status](./maintenance.md#configure-your-firewall) is active and if the needed ports are allowed.
+
 ## Validators
 
 ### Common reasons for your validator being jailed

From ddd7c7058c86c67952cefd52ac01ddc7c26e9cd8 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:35:42 +0200
Subject: [PATCH 07/18] add gateway troubleshooting

---
 documentation/operators/src/nodes/gateway-setup.md   | 9 +++++++--
 documentation/operators/src/nodes/troubleshooting.md | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 34b55f4716..2a5c57b563 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -2,6 +2,10 @@
 
 > The Nym gateway was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
 
+
+```admonish info
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off [by the operator](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators to start shifting to that model instead of running gateway and network requester as two separated binaries.
+```
 > Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
 
 ## Current version
@@ -9,8 +13,6 @@
 <!-- cmdrun ../../../../target/release/nym-gateway --version | grep "Build Version" | cut -b 21-26  -->
 ```
 
-As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off byt the operator, to set the gateway as an exit node. More info on these changes [below](./gateway-setup.md#initialising-gateway-with-network-requester). 
-
 ## Preliminary steps
 
 Make sure you do the preparation listed in the [preliminary steps page](../preliminary-steps.md) before setting up your gateway.
@@ -134,6 +136,9 @@ Save, exit and restart your gateway.
 
 All information about your network requester connected to your gateway is in `/home/user/.nym/gateways/snus/config/network_requester_config.toml`.
 
+To read more about the configuration like whitelisted outbound requestes in `allowed.list` and other useful information, see the page [*Network Requester Whitelist*](network-requester-setup.md#using-your-network-requester).
+
+
 ```admonish info
 Before you bond and run your gateway, please make sure the [firewall configuration](./maintenance.md#configure-your-firewall) is setup so your gateway can be reached from the outside.
 ```
diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index a46332094b..fe9ff47966 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -301,6 +301,15 @@ You don't have to do any additional configuration for your node to implement thi
 
 Check if your [firewall status](./maintenance.md#configure-your-firewall) is active and if the needed ports are allowed.
 
+### My gateway (with network requester) "is still not online..."
+
+Remember the epoch takes up to 1h. It's important to run your node right after bonding so it responds positively on our API ping tests. Otherwise it may be blacklisted.
+
+You may want to diconnect the network requester and let it run as a gatewy alone for some time to regain better routing score. 
+
+If it won't help, simply unbond, delete the config and initialize a new one.
+
+
 ## Validators
 
 ### Common reasons for your validator being jailed

From d103cefed2ab117963de439dff2bf025ab7982f6 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:36:53 +0200
Subject: [PATCH 08/18] spellcheck gateway-setup.md

---
 documentation/operators/src/nodes/gateway-setup.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 2a5c57b563..24f216492d 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -94,7 +94,7 @@ If we follow the previous example with `<ID>` chosen `superexitgateway`, adding
 ```
 ~~~
 
-You can see that the printed information besides identity and sphinx keys also includes a long string called address. This is the addressto be provided to your local [socks5 client](https://nymtech.net/docs/clients/socks5-client.html) as a `--provider` if you wish to connect to your own exit gateway.  
+You can see that the printed information besides identity and sphinx keys also includes a long string called address. This is the address to be provided to your local [socks5 client](https://nymtech.net/docs/clients/socks5-client.html) as a `--provider` if you wish to connect to your own exit gateway.  
 
 #### Add network requester to existing gateway
 
@@ -112,7 +112,7 @@ See the options:
 ```
 ~~~
 
-Run with `--enabled true` flag chosing `<ID>` as `supergateway`:
+Run with `--enabled true` flag choosing `<ID>` as `supergateway`:
 
 ```
 ./nym-gateway setup-network-requester --enabled true --id supergateway 
@@ -136,7 +136,7 @@ Save, exit and restart your gateway.
 
 All information about your network requester connected to your gateway is in `/home/user/.nym/gateways/snus/config/network_requester_config.toml`.
 
-To read more about the configuration like whitelisted outbound requestes in `allowed.list` and other useful information, see the page [*Network Requester Whitelist*](network-requester-setup.md#using-your-network-requester).
+To read more about the configuration like whitelisted outbound requesters in `allowed.list` and other useful information, see the page [*Network Requester Whitelist*](network-requester-setup.md#using-your-network-requester).
 
 
 ```admonish info

From 1e13dc542d92968086d2a8ffc4a6f9fd02c38fbf Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:38:19 +0200
Subject: [PATCH 09/18] spellcheck troubleshooting.md

---
 documentation/operators/src/nodes/troubleshooting.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index fe9ff47966..47de3c3a5e 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -291,7 +291,7 @@ Finally, restart your node. You should see if the mix node is using the port you
 
 ### What is `verloc` and do I have to configure my mix node to implement it?
 
-`verloc` is short for _verifiable location_. Mixnodes and gateways now measure speed-of-light distances to each other, in an attempt to verify how far apart they are. In later releases, this will allow us to algorithmically verify node locations in a non-fakeable and trustworthy manner.
+`verloc` is short for _verifiable location_. Mixnodes and gateways now measure speed-of-light distances to each other, in an attempt to verify how far apart they are. In later releases, this will allow us to algorithmically verify node locations in a non-fake-able and trustworthy manner.
 
 You don't have to do any additional configuration for your node to implement this, it is a passive process that runs in the background of the mixnet from version `0.10.1` onward.
 
@@ -305,9 +305,9 @@ Check if your [firewall status](./maintenance.md#configure-your-firewall) is act
 
 Remember the epoch takes up to 1h. It's important to run your node right after bonding so it responds positively on our API ping tests. Otherwise it may be blacklisted.
 
-You may want to diconnect the network requester and let it run as a gatewy alone for some time to regain better routing score. 
+You may want to disconnect the network requester and let it run as a gatewy alone for some time to regain better routing score. 
 
-If it won't help, simply unbond, delete the config and initialize a new one.
+If it won't help, simply un-bond, delete the config and initialize a new one.
 
 
 ## Validators

From 4d8d40f288cced7394c11857bad1f246c2485692 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:42:00 +0200
Subject: [PATCH 10/18] spellcheck mixnodes-faq.md

---
 documentation/operators/src/faq/mixnodes-faq.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/operators/src/faq/mixnodes-faq.md b/documentation/operators/src/faq/mixnodes-faq.md
index 870c1960a6..c93b51f739 100644
--- a/documentation/operators/src/faq/mixnodes-faq.md
+++ b/documentation/operators/src/faq/mixnodes-faq.md
@@ -14,7 +14,7 @@ For more detailed calculation, read our blog post [Nym Token Economics update](h
 
 ### Which VPS providers would you recommend?
 
-Consider in which jurisdiction you reside and where do you want to run a mix node. Do you want to pay by crypto or not and what are the other important particularities for your case? We always recommend operators to try to chose smaller and decentralized VPS providers over the most known ones controlling a majority of the internet. We receive some good feedback on these: Hertzner, DigitalOcean, Linode, Ghandi and Exoscale. Do your own research and share with the community.
+Consider in which jurisdiction you reside and where do you want to run a mix node. Do you want to pay by crypto or not and what are the other important particularities for your case? We always recommend operators to try to chose smaller and decentralized VPS providers over the most known ones controlling a majority of the internet. We receive some good feedback on these: Hertzner, DigitalOcean, Linode, Ghandi, Flokinet and Exoscale. Do your own research and share with the community.
 
 <!---### Why is a mix node setup on a self-hosted machine so tricky?--->
 
@@ -24,7 +24,7 @@ The sizes are shown in the configs [here](https://github.com/nymtech/nym/blob/1b
 
 ### Why a mix node and a gateway cannot be bond to the same wallet?
 
-Becauase of the way the smart contract works we keep it one-node one-address at the moment.
+Because of the way the smart contract works we keep it one-node one-address at the moment.
 
 ### Which nodes are the most needed to be setup to strengthen Nym infrastructure and which ones bring rewards?
 

From cd425412cc76bb6f73664311652f5458a0d80c98 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:35:43 +0200
Subject: [PATCH 11/18] fix comments mixnodes-faq.md

---
 documentation/operators/src/faq/mixnodes-faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/operators/src/faq/mixnodes-faq.md b/documentation/operators/src/faq/mixnodes-faq.md
index c93b51f739..38c62154b5 100644
--- a/documentation/operators/src/faq/mixnodes-faq.md
+++ b/documentation/operators/src/faq/mixnodes-faq.md
@@ -14,7 +14,7 @@ For more detailed calculation, read our blog post [Nym Token Economics update](h
 
 ### Which VPS providers would you recommend?
 
-Consider in which jurisdiction you reside and where do you want to run a mix node. Do you want to pay by crypto or not and what are the other important particularities for your case? We always recommend operators to try to chose smaller and decentralized VPS providers over the most known ones controlling a majority of the internet. We receive some good feedback on these: Hertzner, DigitalOcean, Linode, Ghandi, Flokinet and Exoscale. Do your own research and share with the community.
+Consider in which jurisdiction you reside and where do you want to run a mix node. Do you want to pay by crypto or not and what are the other important particularities for your case? We always recommend operators to try to choose smaller and decentralised VPS providers over the most known ones controlling a majority of the internet. We receive some good feedback on these: Linode, Ghandi, Flokinet and Exoscale. Do your own research and share with the community.
 
 <!---### Why is a mix node setup on a self-hosted machine so tricky?--->
 

From d5cabb10d6c80daad3665c628cdb40a94589aaa9 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:39:21 +0200
Subject: [PATCH 12/18] fix comments smoosh-faq.md

---
 documentation/operators/src/faq/smoosh-faq.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/operators/src/faq/smoosh-faq.md b/documentation/operators/src/faq/smoosh-faq.md
index ae0f763464..8bcc071e3e 100644
--- a/documentation/operators/src/faq/smoosh-faq.md
+++ b/documentation/operators/src/faq/smoosh-faq.md
@@ -74,7 +74,7 @@ From an operator standpoint, it shall just be a standard Nym upgrade, a new opti
 
 ### Are there any legal concerns for the operators?
 
-So far the general line is running a gateway is not illegal (unless you are in Iran, China, and a few other places) and due to encryption/mixing less risky than running a normal VPN node. For mix nodes, its very safe as they have "no idea" what packets they are mixing.  
+So far the general line is that running a gateway is not illegal (unless you are in Iran, China, and a few other places) and due to encryption/mixing less risky than running a normal VPN node. For mix nodes, it's very safe as they have "no idea" what packets they are mixing.  
 
-There are several legal questions regarding to this and analysis to be made for different jurisdictions. To be able to share resources and findings between the operators themselves we created a [Community Legal Forum](../legal/exit-gateway.md). 
+There are several legal questions and analysis to be made for different jurisdictions. To be able to share resources and findings between the operators themselves we created a [Community Legal Forum](../legal/exit-gateway.md). 
 

From 7df87a9c22299822908ce4e5182f472c26cf25f3 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:51:32 +0200
Subject: [PATCH 13/18] fix comments gateway-setup.md

---
 .../operators/src/nodes/gateway-setup.md       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/operators/src/nodes/gateway-setup.md b/documentation/operators/src/nodes/gateway-setup.md
index 24f216492d..0c95db8b8a 100644
--- a/documentation/operators/src/nodes/gateway-setup.md
+++ b/documentation/operators/src/nodes/gateway-setup.md
@@ -4,7 +4,7 @@
 
 
 ```admonish info
-As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` function which can be turned on or off [by the operator](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators to start shifting to that model instead of running gateway and network requester as two separated binaries.
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` functionality which can be enabled [by the operator](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators begin to shift their setups to this new combined node, instead of operating two separate binaries.
 ```
 > Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
 
@@ -77,9 +77,9 @@ The `$(curl ifconfig.me)` command above returns your IP automatically using an e
 
 #### Initialising gateway with network requester
 
-As some of the [Project Smoosh](../faq/smoosh-faq.md) changes getting implemented, the gateways now can work also as a network requesters at the same time. Such combination creates an exit gateway node, needed for new more open setup. 
+As some of the [Project Smoosh](../faq/smoosh-faq.md) changes getting implemented, network requester is smooshed with gateways. Such combination creates an exit gateway node, needed for new more open setup. 
 
-An operator can initialise the gateway and network requester together by running:
+An operator can initialise the exit gateway functionality by:
 
 ```
 ./nym-gateway init --id <ID> --host $(curl ifconfig.me) --with-network-requester
@@ -94,11 +94,11 @@ If we follow the previous example with `<ID>` chosen `superexitgateway`, adding
 ```
 ~~~
 
-You can see that the printed information besides identity and sphinx keys also includes a long string called address. This is the address to be provided to your local [socks5 client](https://nymtech.net/docs/clients/socks5-client.html) as a `--provider` if you wish to connect to your own exit gateway.  
+You can see that the printed information besides *identity* and *sphinx keys* also includes a long string called *address*. This is the address to be provided to your local [socks5 client](https://nymtech.net/docs/clients/socks5-client.html) as a `--provider` if you wish to connect to your own exit gateway.  
 
 #### Add network requester to existing gateway
 
-If you already have a gateway and got it [upgraded](./maintenance.md#upgrading-your-node) to the [newest version](./gateway-setup.md#current-version), you can easily add a network requester by stopping your gateway and running a command `setup-network-requester`.
+If you already run a gateway and got it [upgraded](./maintenance.md#upgrading-your-node) to the [newest version](./gateway-setup.md#current-version), you can easily change its functionality to exit gateway. PAuse the gateway and run a command `setup-network-requester`.
 
 See the options:
 
@@ -124,7 +124,7 @@ Run with `--enabled true` flag choosing `<ID>` as `supergateway`:
 ```
 ~~~
 
-In case there are any problems, you can also change it manually by editing the gateway config stored in `/home/user/.nym/gateways/<ID>/config/config.toml` where the line under `[network_requester]` needs to be edited from `false` to `true`, it shall look like this:  
+In case there are any problems, you can also change it manually by editing the gateway config stored in `/home/user/.nym/gateways/<ID>/config/config.toml` where the line under `[network_requester]` needs to be edited from `false` to `true`.
 
 ```
 [network_requester]
@@ -132,9 +132,9 @@ In case there are any problems, you can also change it manually by editing the g
 enabled = true
 ```
 
-Save, exit and restart your gateway.
+Save, exit and restart your gateway. Now it is a post-smooshed exit gateway.
 
-All information about your network requester connected to your gateway is in `/home/user/.nym/gateways/snus/config/network_requester_config.toml`.
+All information about network requester part of your exit gateway is in `/home/user/.nym/gateways/snus/config/network_requester_config.toml`.
 
 To read more about the configuration like whitelisted outbound requesters in `allowed.list` and other useful information, see the page [*Network Requester Whitelist*](network-requester-setup.md#using-your-network-requester).
 
@@ -149,7 +149,7 @@ Before you bond and run your gateway, please make sure the [firewall configurati
 
 You can bond your gateway via the Desktop wallet.
 
-1. Open your wallet, and head to the `Bonding` page, then select the node type `Gateway` and input your node details. Press `Next`
+1. Open your wallet, and head to the `Bonding` page, then select the node type `Gateway` and input your node details. Press `Next`.
 
 2. Enter the `Amount`, `Operating cost` and press `Next`.
 

From 11e0b085d55bb174bcf8959b2020960f983ca5ff Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:56:57 +0200
Subject: [PATCH 14/18] fix comments network-requester-setup.md

---
 .../operators/src/nodes/network-requester-setup.md     | 10 +++++-----
 documentation/operators/src/nodes/troubleshooting.md   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/operators/src/nodes/network-requester-setup.md b/documentation/operators/src/nodes/network-requester-setup.md
index ff94054657..05b588fa9a 100644
--- a/documentation/operators/src/nodes/network-requester-setup.md
+++ b/documentation/operators/src/nodes/network-requester-setup.md
@@ -3,9 +3,8 @@
 > The Nym network requester was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
 
 ```admonish info
-As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-network-requester` can be ran as a part of [`nym-gateway`](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators to start shifting to that model instead of running gateway and network requester as two separated binaries.
+As a result of [Project Smoosh](../faq/smoosh-faq.md), the current version of `nym-gateway` binary also contains `nym-network-requester` functionality which can be enabled [by the operator](./gateway-setup.md#initialising-gateway-with-network-requester). This combination is a basis of Nym exit gateway node - an essential piece in our new setup. Please read more in our [Project Smoosh FAQ](../faq/smoosh-faq.md) and [Exit Gateways Page](../legal/exit-gateway.md). We recommend operators begin to shift their setups to this new combined node, instead of operating two separate binaries.
 ```
-
 > Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
 
 ## Current version
@@ -104,6 +103,7 @@ matrix.org
 
 # alephium 
 alephium.org
+
 ```
 
 ## Network Requester Directory
@@ -115,7 +115,7 @@ You can find a list of Network requesters running the default whitelist in the [
 ## Viewing command help
 
 ```admonish info
-If you run your network requester as a part of your gateway according to the suggested setup, please skip the rest of this page and read about [exit gateway setup](./gateway-setup.md#initialising-gateway-with-network-requester).
+If you run your network requester as a part of your exit gateway according to the suggested setup, please skip this part of the page and read about [exit gateway setup](./gateway-setup.md#initialising-gateway-with-network-requester) instead.
 ```
 
 To begin, move to `/target/release` directory from which you run the node commands:
@@ -167,7 +167,7 @@ Now that we have initialized our network-requester, we can start it with the fol
 
 The next thing to do is use your requester, share its address with friends (or whoever you want to help privacy-enhance their app traffic). Is this safe to do? If it was an open proxy, this would be unsafe, because any Nym user could make network requests to any system on the internet.
 
-To make things a bit less stressful for administrators, the Network Requester drops all incoming requests by default. In order for it to make requests, you need to add specific domains to the `allowed.list` file at `$HOME/.nym/service-providers/network-requester/allowed.list` or if network requester is ran from the [gateway binary](./gateway-setup.md#initialising-gateway-with-network-requester), the `allowed.list` will be stored in `~/.nym/gateways/<ID>/data/network-requester-data/allowed.list`
+To make things a bit less stressful for administrators, the Network Requester drops all incoming requests by default. In order for it to make requests, you need to add specific domains to the `allowed.list` file at `$HOME/.nym/service-providers/network-requester/allowed.list` or if network requester is ran as a part of [exit gateway](./gateway-setup.md#initialising-gateway-with-network-requester), the `allowed.list` will be stored in `~/.nym/gateways/<ID>/data/network-requester-data/allowed.list`
 
 ### Global vs local allow lists 
 Your Network Requester will check for a domain against 2 lists before allowing traffic through for a particular domain or IP. 
@@ -187,7 +187,7 @@ How to go about this? Have a look in your nym-network-requester config directory
 # network requester binary
 ls -lt $HOME/.nym/service-providers/network-requester/*/data | grep "list"
 
-# gateway with network requester binary
+# exit gateway binary
 ls -lt $HOME/.nym/gateways/*/data/network-requester-data | grep "list"
 
 # returns: allowed.list  unknown.list
diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index 47de3c3a5e..ad3151092d 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -262,7 +262,7 @@ thread 'tokio-runtime-worker' panicked at 'Failed to create TCP listener: Os { c
 
 Then you need to `--announce-host <PUBLIC_IP>` and `--host <LOCAL_IP>` on startup. This issue is addressed [above](./troubleshooting.md#missing-`announce-host`-flag)
 
-### Can I use a port other than 1789 ?
+### Can I use a port other than 1789?
 
 Yes! Here is what you will need to do:
 

From f4a17ac6982dc1ef93faec6a8bcc29fdd29db34e Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:58:31 +0200
Subject: [PATCH 15/18] fix comments network-requester-setup.md

---
 documentation/operators/src/nodes/network-requester-setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/operators/src/nodes/network-requester-setup.md b/documentation/operators/src/nodes/network-requester-setup.md
index 05b588fa9a..aef7c1c3d2 100644
--- a/documentation/operators/src/nodes/network-requester-setup.md
+++ b/documentation/operators/src/nodes/network-requester-setup.md
@@ -22,7 +22,7 @@ If you have access to a server, you can run the network requester, which allows
 
 By default the network requester is **not** an open proxy (although it can be used as one). It uses a file called `allowed.list` (located in `~/.nym/service-providers/network-requester/<NETWORK-REQUESTER-ID>/`) as a whitelist for outbound requests.
 
-**Note:** If you run network requester as a part of the gateway the `allowed.list` will be stored in `~/.nym/gateways/snus/data/network-requester-data/allowed.list`.
+**Note:** If you run network requester as a part of the exit gateway (suggested setup) the `allowed.list` will be stored in `~/.nym/gateways/<ID>/data/network-requester-data/allowed.list`.
 
 Any request to a URL which is not on this list will be blocked.
 

From d79eda40a4404b2024176e65bd944a3068445dc0 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:03:19 +0200
Subject: [PATCH 16/18] fix comments network-requester-setup.md

---
 documentation/operators/src/nodes/network-requester-setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/operators/src/nodes/network-requester-setup.md b/documentation/operators/src/nodes/network-requester-setup.md
index aef7c1c3d2..5e7cd7969e 100644
--- a/documentation/operators/src/nodes/network-requester-setup.md
+++ b/documentation/operators/src/nodes/network-requester-setup.md
@@ -193,7 +193,7 @@ ls -lt $HOME/.nym/gateways/*/data/network-requester-data | grep "list"
 # returns: allowed.list  unknown.list
 ```
 
-We already know that `allowed.list` is what lets requests go through. All unknown requests are logged to `unknown.list`. If you want to try using a new client type, just start the new application, point it at your local [socks client](https://nymtech.net/docs/clients/socks5-client.html) (configured to use your remote `nym-network-requester`), and keep copying URLs from `unknown.list` into `allowed.list` (it may take multiple tries until you get all of them, depending on the complexity of the application). Make sure to delete the copied ones in 'unknown.list' and restart your network requester or gateway with network requester!
+We already know that `allowed.list` is what lets requests go through. All unknown requests are logged to `unknown.list`. If you want to try using a new client type, just start the new application, point it at your local [socks client](https://nymtech.net/docs/clients/socks5-client.html) (configured to use your remote `nym-network-requester`), and keep copying URLs from `unknown.list` into `allowed.list` (it may take multiple tries until you get all of them, depending on the complexity of the application). Make sure to delete the copied ones in `unknown.list` and restart your exit gateway or standalone network requester.
 
 > If you are adding custom domains, please note that whilst they may appear in the logs of your network-requester as something like `api-0.core.keybaseapi.com:443`, you **only need** to include the main domain name, in this instance `keybaseapi.com`
 

From 26217f53ae6afa0c89397eb294cc9af3130334e6 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:10:44 +0200
Subject: [PATCH 17/18] fix comments troubleshooting.md

---
 documentation/operators/src/nodes/troubleshooting.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index ad3151092d..1942dac60a 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -299,15 +299,13 @@ You don't have to do any additional configuration for your node to implement thi
 
 ### My gateway seems to be running but appears offline
 
-Check if your [firewall status](./maintenance.md#configure-your-firewall) is active and if the needed ports are allowed.
+Check your [firewall](./maintenance.md#configure-your-firewall) is active and if the necessary ports are open / allowed.
 
-### My gateway (with network requester) "is still not online..."
+### My exit gateway "is still not online..."
 
-Remember the epoch takes up to 1h. It's important to run your node right after bonding so it responds positively on our API ping tests. Otherwise it may be blacklisted.
+The Nyx chain epoch takes up to 60 min. To prevent the gateway getting blacklisted, it's important to run it right after the bonding process to return positive response our API testing it's routing score.
 
-You may want to disconnect the network requester and let it run as a gatewy alone for some time to regain better routing score. 
-
-If it won't help, simply un-bond, delete the config and initialize a new one.
+You may want to disconnect the network requester and let it run as a gatewy alone for some time to regain better routing score and then areturn to the full [exit gateway finctionality](./gateway-setup.md#initialising-gateway-with-network-requester).
 
 
 ## Validators

From 42d3c3eec57cb1fa4ffd81e04d75275f56bb6aa0 Mon Sep 17 00:00:00 2001
From: serinko <97586125+serinko@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:22:11 +0200
Subject: [PATCH 18/18] fix comments troubleshooting.md

---
 documentation/operators/src/nodes/troubleshooting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/operators/src/nodes/troubleshooting.md b/documentation/operators/src/nodes/troubleshooting.md
index 1942dac60a..7e2f37503d 100644
--- a/documentation/operators/src/nodes/troubleshooting.md
+++ b/documentation/operators/src/nodes/troubleshooting.md
@@ -236,7 +236,7 @@ Here is a sample of the `init` command example to create the mix node config.
 ./nym-mixnode init --id <YOUR_ID> --host 0.0.0.0 --announce-host 85.160.12.13
 ```
 
-- `--host 0.0.0.0` should work every time even if your local machine IPv4 address changes. For example on Monday your router gives your machine an address `192.168.0.13` and on Wednesday, the DHCP lease will end and you will be assigned `192.168.0.14`. Using `0.0.0.0` should avoid this without having to set any static IP in your router's configuration.
+- `--host 0.0.0.0` should work every time even if your local machine IPv4 address changes. For example on Monday your router gives your machine an address `192.168.0.13` and on Wednesday, the [DHCP](https://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol) lease will end and you will be assigned `192.168.0.14`. Using `0.0.0.0` should avoid this without having to set any static IP in your router's configuration.
 
 - you can get your current IPv4 address by either using `curl ipinfo.io` if you're on MacOS or Linux or visiting [whatsmyip site](https://www.whatsmyip.org/). Simply copy it and use it as `--anounce-host` address.