diff --git a/manuscript/ha-docker-swarm/docker-swarm-mode.md b/manuscript/ha-docker-swarm/docker-swarm-mode.md
index e8b63a7..704903f 100644
--- a/manuscript/ha-docker-swarm/docker-swarm-mode.md
+++ b/manuscript/ha-docker-swarm/docker-swarm-mode.md
@@ -70,9 +70,7 @@ xmw49jt5a1j87a6ihul76gbgy *  ds2.funkypenguin.co.nz  Ready   Active        Reach
 [root@ds2 davidy]#
 ````
 
-Repeat the process to add your third node. **You need a new token for the third node, don't re-use the manager token you generated for the second node**.
-
-!!! warning "Seriously. Don't use a token more than once, else it's swarm-rebuilding time."
+Repeat the process to add your third node.
 
 Finally, ```docker node ls``` should reflect that you have 3 reachable manager nodes, one of whom is the "Leader":
 
diff --git a/manuscript/recipies/mail.md b/manuscript/recipies/mail.md
index 266ed43..1f18144 100644
--- a/manuscript/recipies/mail.md
+++ b/manuscript/recipies/mail.md
@@ -21,12 +21,12 @@ docker-mailserver doesn't include a webmail client, and one is not strictly need
 
 ### Setup data locations
 
-We'll need several directories to bind-mount into our container, so create them in /var/data/mailserver:
+We'll need several directories to bind-mount into our container, so create them in /var/data/docker-mailserver:
 
 ```
 cd /var/data
-mkdir mailserver
-cd mailserver
+mkdir docker-mailserver
+cd docker-mailserver
 mkdir {maildata,mailstate,config,letsencrypt}
 ```
 
@@ -106,18 +106,18 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - /var/data/mail/maildata:/var/mail
-      - /var/data/mail/mailstate:/var/mail-state
-      - /var/data/mail/config:/tmp/docker-mailserver
-      - /var/data/mail/letsencrypt:/etc/letsencrypt
-    env_file: /var/data/mail/.env
+      - /var/data/docker-mailserver/maildata:/var/mail
+      - /var/data/docker-mailserver/mailstate:/var/mail-state
+      - /var/data/docker-mailserver/config:/tmp/docker-mailserver
+      - /var/data/docker-mailserver/letsencrypt:/etc/letsencrypt
+    env_file: /var/data/docker-mailserver/docker-mailserver.env
     networks:
       - internal
     deploy:
       replicas: 1
 
 networks:
-  traefik:
+  traefik_public:
     external: true
   internal:
     driver: overlay
@@ -129,7 +129,7 @@ networks:
 !!! note
     Setup unique static subnets for every stack you deploy. This avoids IP/gateway conflicts which can otherwise occur when you're creating/removing stacks a lot.
 
-A sample .env file looks like this:
+A sample docker-mailserver.env file looks like this:
 
 ```
 ENABLE_SPAMASSASSIN=1
@@ -148,7 +148,7 @@ SSL_TYPE=letsencrypt
 
 ### Launch mailserver
 
-Launch the mail server stack by running ```docker stack deploy mailserver -c <path -to-docker-compose.yml>```
+Launch the mail server stack by running ```docker stack deploy docker-mailserver -c <path-to-docker-mailserver.yml>```
 
 ## Chef's Notes