diff --git a/scripts/Makefile b/scripts/Makefile
index e1661c5..25dfa38 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -110,31 +110,35 @@ tor2-pkt-per-sec:
 
 lightning-window:
 	./run-3 \
-		32,lightning_window. \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=200, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=3000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=5000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=8000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=13000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=200, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=3000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=5000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=8000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=13000. \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=200, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=3000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=5000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=8000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=13000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=200, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=3000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=5000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=8000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=13000. \
+		64,lightning_window. \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=200, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=1000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=3000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=5000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=8000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=13000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=34000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=200, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=1000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=3000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=5000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=8000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=13000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=34000. \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=200, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=1000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=3000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=5000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=8000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=13000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=34000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=200, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=1000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=3000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=5000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=8000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=13000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=34000. \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
@@ -162,41 +166,35 @@ lightning-window:
 
 lightning-links:
 	./run-3 \
-		32,lightning_links. \
-		lightning-client 7500 40 172 4 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 6 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 8 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 10 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 14 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 20 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 24 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 8 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 10 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 14 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 20 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 24 fast_count=4!tick_tock=0!measlat=1!window=2000. \
-		lightning-server 7500 40 172 4 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 6 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 8 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 10 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 14 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 20 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 24 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 8 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 10 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 14 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 20 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 24 fast_count=4!tick_tock=0!measlat=1!window=2000. \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
+		64,lightning_links. \
+		lightning-client 7500 40 172 4 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 6 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 8 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 10 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 14 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 16 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 20 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 8 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 10 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 14 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 16 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 20 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 4 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 6 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 8 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 10 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 14 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 20 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 8 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 10 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 14 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 20 fast_count=3!tick_tock=0!measlat=1!window=2000, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
@@ -224,8 +222,6 @@ lightning-links:
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple.
 
 lightning-complementarity:
@@ -246,43 +242,31 @@ lightning-complementarity:
 
 lightning-fastcount:
 	./run-3 \
-		32,lightning_fastcount. \
-		lightning-client 7500 40 172 16 fast_count=1!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=5!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=6!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=7!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=8!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=1!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=2!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=5!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=6!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=7!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 16 fast_count=8!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=1!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=5!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=6!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=7!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=8!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=1!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=5!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=6!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=7!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=8!tick_tock=0!measlat=1!window=2000, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
+		64,lightning_fastcount. \
+		lightning-client 7500 40 172 12 fast_count=1!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=5!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=6!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=1!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=2!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=5!tick_tock=0!measlat=1!window=2000, \
+		lightning-client 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=1!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=5!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=6!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=1!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=2!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=5!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
@@ -306,8 +290,4 @@ lightning-fastcount:
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
-		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple.