diff --git a/config/ADN-SAMPLE-commented.cfg b/config/ADN-SAMPLE-commented.cfg
index 1c254e8..95298a2 100755
--- a/config/ADN-SAMPLE-commented.cfg
+++ b/config/ADN-SAMPLE-commented.cfg
@@ -156,11 +156,14 @@ TABLE: repeaters
 # OpenBridge does not 'register', so registration ACL is meaningless.
 # OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
 # Otherwise ACLs work as described in the global stanza
+#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
+#If you joing ADN-Systems, you will be given a config like this to paste in
 [OBP-TEST]
 MODE: OPENBRIDGE
 ENABLED: False
 IP:
 PORT: 62044
+#The ID which you expect to see sent from the other end of the link. 
 NETWORK_ID: 1
 PASSPHRASE: mypass
 TARGET_IP: 
@@ -168,9 +171,13 @@ TARGET_PORT: 62044
 USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
-RELAX_CHECKS: False
-ENHANCED_OBP: False
-PROTO_VER: 2 
+#Should always be true if using docker. 
+RELAX_CHECKS: True
+#True for FBP, False for OBP
+ENHANCED_OBP: True
+#PROTO_VER should be 5 for ADN-Systems servers using FBP
+#1 for other servers using OBP
+PROTO_VER: 5
 
 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
@@ -185,29 +192,66 @@ PROTO_VER: 2
 #
 # ACLs:
 # See comments in the GLOBAL stanza
-[G9XYZ]
+#This defines parameters for repeater/hotspot connections 
+#via HomeBrewProtocol (HBP)
+#I don't recommend changing most of this unless you know what you are doing
+[SYSTEM]
 MODE: MASTER
-ENABLED: False
+ENABLED: True
 REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
-IP:
-PORT: 54001
-PASSPHRASE: passw0rd
+IP: 127.0.0.1
+PORT: 56400
+PASSPHRASE:
 GROUP_HANGTIME: 5
 USE_ACL: True
 REG_ACL: DENY:1
 SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
-DEFAULT_UA_TIMER: 10
+DEFAULT_UA_TIMER: 60
 SINGLE_MODE: False
 VOICE_IDENT: False
-#the next three lines no longer have any effect 
 TS1_STATIC:
 TS2_STATIC:
 DEFAULT_REFLECTOR: 0
 ANNOUNCEMENT_LANGUAGE: en_GB
-GENERATOR: 1
+GENERATOR: 100
 ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
+OVERRIDE_IDENT_TG:
+
+#Echo (Loro / Parrot) server
+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 127.0.0.1
+PORT: 54916
+MASTER_IP: 127.0.0.1
+MASTER_PORT: 54915
+PASSPHRASE: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 1000001
+RX_FREQ: 449000000
+TX_FREQ: 444000000
+TX_POWER: 25
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: 9990 Parrot
+DESCRIPTION: ECHO
+URL: adn.systems
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_ADN-Systems
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+ANNOUNCEMENT_LANGUAGE: en_GB