diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 35fe4873aeef967b8b2bf47ac70f9b22c2b0fff6..0071f9ebc56c0e20ae9f5df252ff6e8e49941011 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,3 +1,4 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 WARNING: unsafe channel creation enabled
 Adding authenticated channel for: AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD
 Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
@@ -5,5 +6,5 @@ Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encr
 Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
-Timed out!
-Received 2
+Message received: Hi 9->18, with E2E Encryption
+Received 3
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index 52d13dd35c68fd820a309709461e20b56c0f0cb1..4c9809ef12fc6c6b8fdd96954e28e37eccd6e4e0 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,6 +1,5 @@
-Sending to B/M26uMTvJJcex4hUJjjeXjXUQ77ErzHICS4JdfEvXwD: Hello, World
-Message received: Hello, World
-Received 1
-Sending to un/Q/vosCqvAnBspJrH+NOzE+8L9TR8XfIyBMERcsGQD: Hi Ben, from Rick
-Message received: Hello, World
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
+Sent: Hello from Rick42 to myself, without E2E Encryption
+Message received: Hello from Rick42 to myself, without E2E Encryption
 Received 1
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index e4ce2e8d9a30d830c5714594c59303e6d62e4766..a920b1ef9efbdd66ad376478a84efbaaa8bbbff6 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,6 +1,2 @@
-Sending to un/Q/vosCqvAnBspJrH+NOzE+8L9TR8XfIyBMERcsGQD: Hello, World
-Timed out!
-Received 0
-Sending to B/M26uMTvJJcex4hUJjjeXjXUQ77ErzHICS4JdfEvXwD: Hi Rick, From Ben
-Timed out!
-Received 0
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index 3f9cec46d72832e0dc3dc7b7b0d9fac05bae428a..94bbda39f0a27b43f50a46b392627ed45a8a4f4a 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,6 +1,84 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
 Message received: Hello, 4
-Received 1
+Received 20
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
+Message received: Hello, 4
 Message received: Hello, 4
-Received 1
+Received 20
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index e50e3df2b4ad4e9aaf2bca181e11cfe4f7a55132..e8d620784e731de7b4fd03c9032ca11f1e26007d 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,6 +1,84 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
 Message received: Hello, 5
-Received 1
+Received 20
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
+Message received: Hello, 5
 Message received: Hello, 5
-Received 1
+Received 20
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index fb355645905d371752c0ba9ba46ebabe7593ffb5..0ac9000d3a93a06a5fb5167b484d2a66a575946e 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,6 +1,84 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
 Message received: Hello, 6
-Received 1
+Received 20
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
+Message received: Hello, 6
 Message received: Hello, 6
-Received 1
+Received 20
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index c3e4032782132a4d26697299ab90d73c074fbf01..1490ff17c76d7b22a2f94b28c950ef82d11fd965 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,6 +1,84 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
 Message received: Hello, 7
-Received 1
+Received 20
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
+Message received: Hello, 7
 Message received: Hello, 7
-Received 1
+Received 20
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 341412816a199ff0df2f90aabed392d7c7636043..29bdf78b914708de6afbc803a973b6a2559095a4 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,3 +1,4 @@
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 WARNING: unsafe channel creation enabled
 Adding authenticated channel for: AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD
 Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
@@ -5,11 +6,13 @@ Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encry
 Message received: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Received 2
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
 Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
-Timed out!
-Received 1
+Message received: Hi 9->9, with E2E Encryption
+Received 2
+Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
 WARNING: unsafe channel creation enabled
 Adding authenticated channel for: AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD
 Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 6fdb2f5324bbb58906802421f48e4c6f48dae8ca..a4e336a50d6399e474afbfdbd5e673248a886d89 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -210,51 +210,45 @@ eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact test2-contact.json --destfile test1-contact.json -w 0 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact ben43-contact.json --destfile rick42-contact.json --waitTimeout 30 --receiveCount 0 -m \"Hello from Ben43, with E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL2
-TMPID=$(cat $CLIENTOUT/client42.txt | grep "User\:" | awk -F' ' '{print $5}')
+TMPID=$(cat $CLIENTOUT/client42.log | grep "User\:" | awk -F' ' '{print $5}')
 RICKID=${TMPID}
 echo "RICK ID: $RICKID"
-TMPID=$(cat $CLIENTOUT/client43.txt | grep "User\:" | awk -F' ' '{print $5}')
+TMPID=$(cat $CLIENTOUT/client43.log | grep "User\:" | awk -F' ' '{print $5}')
 BENID=${TMPID}
 echo "BEN ID: $BENID"
 
 # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
-CLIENTCMD="timeout 210s ../bin/client -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID -c 10 -w 11 -m \"Hello from Rick42, with E2E Encryption\""
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 6 -m \"Hello from Rick42, with E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-wait $PIDVAL
-CLIENTCMD="timeout 210s ../bin/client -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID -c 10 -w 10 -m \"Hello from Ben43, with E2E Encryption\""
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+wait $PIDVAL2
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-
-
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob43 --destid b64:$ID1 -m "Watup Dog?" > cmd4-user2.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob42 --destid b64:$ID2 -m "Watup user1->user2" > cmd5-user1.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob43 --destid b64:$ID1 -m "Watup Dog 2?" > cmd6-user2.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob42 --destid b64:$ID2 -m "Watup 2 user1->user2" > cmd7-user1.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob43 --destid b64:$ID1 -m "Watup Dog 2?" > cmd8-user2.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob42 --destid b64:$ID2 -m "Watup 2 user1->user2" > cmd9-user1.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob43 --destid b64:$ID1 -m "Watup Dog 2?" > cmd10-user2.log 2>&1 || true
-# go run main.go --verbose --password hello --ndf ~/integration/basice2e/ndf.json --unsafe-channel-creation -s blob42 --destid b64:$ID2 -m "Watup 2 user1->user2" > cmd11-user1.log 2>&1 || true
-# set +x
-# popd
-
-
+wait $PIDVAL2
 
 cp $CLIENTOUT/*.txt $CLIENTCLEAN/
 
-# Ignore rekey for now
-#rm $CLIENTCLEAN/*_rekey.txt
-
-#sed -i 's/Sending\ Message\ to\ .*,\ :/Sent:/g' $CLIENTCLEAN/client4[23].txt
-#sed -i 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client4[23].txt
+sed -i 's/Sending\ to\ .*\:/Sent:/g' $CLIENTCLEAN/client4[23].txt
+sed -i 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client4[23].txt
+sed -i 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt
 
 # for C in $(ls -1 $CLIENTCLEAN); do
 #     sort -o tmp $CLIENTCLEAN/$C  || true
@@ -268,8 +262,8 @@ echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..."
 set +x
 diff -ruN clients.goldoutput $CLIENTCLEAN
 
-cat $CLIENTOUT/* | strings | grep -e "ERROR" -e "FATAL" > results/client-errors || true
-diff -ruN results/client-errors.txt noerrors.txt
+#cat $CLIENTOUT/* | strings | grep -e "ERROR" -e "FATAL" > results/client-errors || true
+#diff -ruN results/client-errors.txt noerrors.txt
 cat $SERVERLOGS/server-*.log | grep "ERROR" | grep -v "context" | grep -v "metrics" | grep -v "database" > results/server-errors.txt || true
 cat $SERVERLOGS/server-*.log | grep "FATAL" | grep -v "context" | grep -v "transport is closing" | grep -v "database" >> results/server-errors.txt || true
 diff -ruN results/server-errors.txt noerrors.txt
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index 984c0fb622f1cd7ce4104d09fe953d172ff4e53c..fe850d69102f51e8cad32f8cd10889c81ef3f952 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -15,6 +15,7 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"
         errOutput: "results/servers/server-1.err"
+        ipListOutput: "results/servers/iplist-1.txt"
     port: 50000
     listeningAddress: "127.0.0.1"
 database:
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index aad89c4e598d5760e824496f3d939fbe81e8bae0..9d837df9052fb88ee0ff7c0df21e34ca2e4e82f9 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -15,6 +15,7 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-2.log"
         errOutput: "results/servers/server-2.err"
+        ipListOutput: "results/servers/iplist-2.txt"
     port: 50001
     listeningAddress: "127.0.0.1"
 database:
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 5f1806f4c0ecb4dcabb34274724dd903ec41525d..5debc9f14ee5fa666098740552044754d7c290cb 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -15,6 +15,7 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-3.log"
         errOutput: "results/servers/server-3.err"
+        ipListOutput: "results/servers/iplist-3.txt"
     port: 50002
     listeningAddress: "127.0.0.1"
 database:
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 3aa0f0be5ab701b770c85c52aeba2c6b3d23572f..a5233430f7b65256d86992c63a2b53053e3049d6 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -15,6 +15,7 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-4.log"
         errOutput: "results/servers/server-4.err"
+        ipListOutput: "results/servers/iplist-4.txt"
     port: 50003
     listeningAddress: "127.0.0.1"
 database:
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 186353298050d10f3ba16efb290140c08684b48e..6d76a6a3a22d8ffcab47348440138d00d21b8353 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -15,6 +15,7 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-5.log"
         errOutput: "results/servers/server-5.err"
+        ipListOutput: "results/servers/iplist-5.txt"
     port: 50004
     listeningAddress: "127.0.0.1"
 database: