diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index f2dbb82efb7d09711350319b66f5c0f58c9a221b..aaf46d6d595a0d72bcf3df42ccd19d0bb0236f09 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,8 +1,8 @@
 WARNING: unsafe channel creation enabled
 Adding a
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client18_rekey.txt b/basice2e/clients.goldoutput/client18_rekey.txt
index fb895dced15b9c75c59118440289934326d6e311..52a891ecf3e106f5cb29b3993e3c31a6740b4f7d 100644
--- a/basice2e/clients.goldoutput/client18_rekey.txt
+++ b/basice2e/clients.goldoutput/client18_rekey.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client35.txt b/basice2e/clients.goldoutput/client35.txt
index 87ef8442cb54890d64bc25190a50198b37381c14..917ca25f7955d73add33602652e26f3b14ca4bf6 100644
--- a/basice2e/clients.goldoutput/client35.txt
+++ b/basice2e/clients.goldoutput/client35.txt
@@ -9,3 +9,14 @@ Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Received 5
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client36.txt b/basice2e/clients.goldoutput/client36.txt
index 403715dd1e3207f994a3456c81fc591a0c6590ce..b5e84251ca797fa95730b433ae8845aeeaa72c08 100644
--- a/basice2e/clients.goldoutput/client36.txt
+++ b/basice2e/clients.goldoutput/client36.txt
@@ -9,3 +9,14 @@ Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Received 5
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index 012f3b4774f902e91f8ccea31d9041c7d0ee8f3a..1e74af66cd5ed71951cd9b6e39301a0a0d15fc60 100644
Binary files a/basice2e/clients.goldoutput/client42.txt and b/basice2e/clients.goldoutput/client42.txt differ
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index bf2db33796f8fb3bc11ac073f144f74edfb10a69..16063ec57c6996ecd6657514668a14d411bb9b5e 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,23 +1,23 @@
-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
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
 Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
@@ -39,26 +39,26 @@ Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
 Received 20
-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
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
 Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 010ac2e05bcdefa54e3e57e7419100df9277e778..ce4bf8ef7f0da2c4d97cfbbc5ed5c5569eadbc20 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,23 +1,23 @@
-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
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
 Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
@@ -39,26 +39,26 @@ Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
 Received 20
-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
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
 Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 0f8eb4562e1bfce4c9f09c28914a11ea1c00a9b1..6e6f04184108bb53758583ff3c006f6fd2d8c663 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,23 +1,23 @@
-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
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
 Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
@@ -39,26 +39,26 @@ Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
 Received 20
-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
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
 Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 7f5416de5df6e9ede33ae098e4632cb79c471055..767b3dc41cea6a28bc5fc6967fa7cb24815ecba0 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,23 +1,23 @@
-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
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
 Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
@@ -39,26 +39,26 @@ Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
 Received 20
-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
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
 Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index ac3d28fada9db277fac5da38496e3b9d6acb2b77..6efc1ff1aa8bd3455fb32e3c0eea09842a48f907 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,20 +1,20 @@
 WARNING: unsafe channel creation enabled
 Adding a
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Received 2
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Received 2
 WARNING: unsafe channel creation enabled
 Adding a
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client9_rekey.txt b/basice2e/clients.goldoutput/client9_rekey.txt
index 62a66689efa1702323b8457f4de42afe1871aa96..898db886c2b92701d5181fe2027213f3dc9c6d50 100644
--- a/basice2e/clients.goldoutput/client9_rekey.txt
+++ b/basice2e/clients.goldoutput/client9_rekey.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption