diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index f11f062cdb3a3972305533ab5ecd5c2a1b034a21..1237a08edbe0046a975979c966aae96f80eaaf0e 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -1,5 +1,6 @@
+# START YAML ===
 ################################################################################
-## Copyright © 2018 Privategrity Corporation                                   #
+## Copyright © 2019 Privategrity Corporation                                   #
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
@@ -7,6 +8,7 @@
 # Output log file
 log: "results/gateways/gateway-1.log"
 
+# Used for debugging
 verbose: "true"
 
 # The cMix nodes in the network
@@ -16,8 +18,6 @@ cMixNodes:
  - "localhost:50002"
  - "localhost:50003"
  - "localhost:50004"
-# The index to which this Gateway is attached in the cMixNodes list
-GatewayNodeIndex: 0
 
 # The listening address of this gateway
 GatewayAddress: "localhost:8440"
@@ -26,13 +26,16 @@ GatewayAddress: "localhost:8440"
 # deleted from the user's message queue
 MessageTimeout: 1800
 
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the gateway private key file
 keyPath: "../keys/gateway.cmix.rip.key"
+# Path to the gateway certificate file
 certPath: "../keys/gateway.cmix.rip.crt"
+# Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Number of nodes in the cMix Network
-
 # Batch size of the cMix Network (to be deprecated)
 batchSize: 4
+# === END YAML
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index b556c4868d1cd5fbccd334998a24296fc72a2cba..b0c1dde31e0af7759af93e76094927ee4749d040 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -1,5 +1,6 @@
+# START YAML ===
 ################################################################################
-## Copyright © 2018 Privategrity Corporation                                   #
+## Copyright © 2019 Privategrity Corporation                                   #
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
@@ -7,6 +8,7 @@
 # Output log file
 log: "results/gateways/gateway-2.log"
 
+# Used for debugging
 verbose: "true"
 
 # The cMix nodes in the network
@@ -16,8 +18,6 @@ cMixNodes:
  - "localhost:50002"
  - "localhost:50003"
  - "localhost:50004"
-# The index to which this Gateway is attached in the cMixNodes list
-GatewayNodeIndex: 1
 
 # The listening address of this gateway
 GatewayAddress: "localhost:8441"
@@ -26,13 +26,16 @@ GatewayAddress: "localhost:8441"
 # deleted from the user's message queue
 MessageTimeout: 1800
 
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the gateway private key file
 keyPath: "../keys/gateway.cmix.rip.key"
+# Path to the gateway certificate file
 certPath: "../keys/gateway.cmix.rip.crt"
+# Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Number of nodes in the cMix Network
-
 # Batch size of the cMix Network (to be deprecated)
 batchSize: 4
+# === END YAML
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index cc775fd974f21563e400ce4f13ae549d07b2dcee..dccf68d1350676534ecd555de750a0c4699587c6 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -1,5 +1,6 @@
+# START YAML ===
 ################################################################################
-## Copyright © 2018 Privategrity Corporation                                   #
+## Copyright © 2019 Privategrity Corporation                                   #
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
@@ -7,6 +8,7 @@
 # Output log file
 log: "results/gateways/gateway-3.log"
 
+# Used for debugging
 verbose: "true"
 
 # The cMix nodes in the network
@@ -16,8 +18,6 @@ cMixNodes:
  - "localhost:50002"
  - "localhost:50003"
  - "localhost:50004"
-# The index to which this Gateway is attached in the cMixNodes list
-GatewayNodeIndex: 2
 
 # The listening address of this gateway
 GatewayAddress: "localhost:8442"
@@ -26,13 +26,16 @@ GatewayAddress: "localhost:8442"
 # deleted from the user's message queue
 MessageTimeout: 1800
 
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the gateway private key file
 keyPath: "../keys/gateway.cmix.rip.key"
+# Path to the gateway certificate file
 certPath: "../keys/gateway.cmix.rip.crt"
+# Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Number of nodes in the cMix Network
-
 # Batch size of the cMix Network (to be deprecated)
 batchSize: 4
+# === END YAML
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index 01a4c87d6587e1ff62d7e06d1ee053c2c1755cb1..a0630ae88ff8ac8c1800a0923f32ea85373b624a 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -1,5 +1,6 @@
+# START YAML ===
 ################################################################################
-## Copyright © 2018 Privategrity Corporation                                   #
+## Copyright © 2019 Privategrity Corporation                                   #
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
@@ -7,6 +8,7 @@
 # Output log file
 log: "results/gateways/gateway-4.log"
 
+# Used for debugging
 verbose: "true"
 
 # The cMix nodes in the network
@@ -16,8 +18,6 @@ cMixNodes:
  - "localhost:50002"
  - "localhost:50003"
  - "localhost:50004"
-# The index to which this Gateway is attached in the cMixNodes list
-GatewayNodeIndex: 3
 
 # The listening address of this gateway
 GatewayAddress: "localhost:8443"
@@ -26,13 +26,16 @@ GatewayAddress: "localhost:8443"
 # deleted from the user's message queue
 MessageTimeout: 1800
 
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the gateway private key file
 keyPath: "../keys/gateway.cmix.rip.key"
+# Path to the gateway certificate file
 certPath: "../keys/gateway.cmix.rip.crt"
+# Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Number of nodes in the cMix Network
-
 # Batch size of the cMix Network (to be deprecated)
 batchSize: 4
+# === END YAML
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index bddcb768b29c2f79eebf80ffdf7c6efabdd8d26f..4c6020588d657979f7b8ccc035a43702c24a29ef 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -1,5 +1,6 @@
+# START YAML ===
 ################################################################################
-## Copyright © 2018 Privategrity Corporation                                   #
+## Copyright © 2019 Privategrity Corporation                                   #
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
@@ -7,6 +8,7 @@
 # Output log file
 log: "results/gateways/gateway-5.log"
 
+# Used for debugging
 verbose: "true"
 
 # The cMix nodes in the network
@@ -16,8 +18,6 @@ cMixNodes:
  - "localhost:50002"
  - "localhost:50003"
  - "localhost:50004"
-# The index to which this Gateway is attached in the cMixNodes list
-GatewayNodeIndex: 4
 
 # The listening address of this gateway
 GatewayAddress: "localhost:8444"
@@ -26,13 +26,16 @@ GatewayAddress: "localhost:8444"
 # deleted from the user's message queue
 MessageTimeout: 1800
 
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the gateway private key file
 keyPath: "../keys/gateway.cmix.rip.key"
+# Path to the gateway certificate file
 certPath: "../keys/gateway.cmix.rip.crt"
+# Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
-# Number of nodes in the cMix Network
-
 # Batch size of the cMix Network (to be deprecated)
 batchSize: 4
+# === END YAML