diff --git a/basice2e/clients.goldoutput/client20.txt b/basice2e/clients.goldoutput/client20.txt
index 9576ea854f487e54b187ce4f5a327a797fc914d1..2b10e4046835de371f6c155d4167bd3efefa75c4 100644
--- a/basice2e/clients.goldoutput/client20.txt
+++ b/basice2e/clients.goldoutput/client20.txt
@@ -3,20 +3,40 @@ Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
-Received 5
+Received 10
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
-Received 5
+Received 10
diff --git a/basice2e/clients.goldoutput/client21.txt b/basice2e/clients.goldoutput/client21.txt
index 0ce63adb0c05c577975d35f62348f44419cb2379..12b9325a98938a9ca969f1321a8fb084bb3283ea 100644
--- a/basice2e/clients.goldoutput/client21.txt
+++ b/basice2e/clients.goldoutput/client21.txt
@@ -3,20 +3,40 @@ Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 5
+Received 10
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 5
+Received 10
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 2fea1029448d187781f6ba8c9b753781f9a6df30..fa727a6bc236dd6f51f9c7c4212e4f3d2a3cdf39 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -23,8 +23,7 @@ fi
 PERMISSIONING=$1
 
 # todo revert this
-DEBUGLEVEL=1
-
+DEBUGLEVEL=${DEBUGLEVEL-0}
 
 #export GRPC_GO_LOG_VERBOSITY_LEVEL=99
 #export GRPC_GO_LOG_SEVERITY_LEVEL=info
@@ -264,12 +263,12 @@ then
     wait $PIDVAL
     wait $PIDVAL2
 
-    echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)" # todo: remove -v calls below
-    CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
+    echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)"
+    CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
     PIDVAL=$!
     echo "$CLIENTCMD -- $PIDVAL"
-    CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
+    CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
     PIDVAL2=$!
     echo "$CLIENTCMD -- $PIDVAL"
@@ -395,12 +394,12 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 wait $PIDVAL2
 
-echo "FORCING MESSAGE PICKUP RETRY... " # todo: remove -v calls below
-CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
+echo "FORCING MESSAGE PICKUP RETRY... "
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"