diff --git a/scripts/Makefile b/scripts/Makefile
index d6f1405..2e01297 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,709 +1,5 @@
 SHELL := /bin/bash
 
-simple_test:
-	./run-3 \
-		1,simple_test . \
-		thunder-client 600 100 100 8 150 . \
-		thunder-server 8 150 100. \
-		tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple
-
-simple_test_2:
-	./run-3 \
-		1,simple_test . \
-		orig-client 600 100 100 . \
-		orig-server 100 100. \
-		tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple
-
-tor_bw_small:
-	./run-3 \
-		1,tor_bw_small . \
-		orig-client 60 1000 100, \
-		  orig-client 120 500 100, \
-		  orig-client 600 100 100, \
-		  orig-client 1200 50 100 . \
-		orig-server 100, \
-		  orig-server 100, \
-		  orig-server 100, \
-		  orig-server 100. \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple
-
-tor_bw_small_parse:
-	@. parse_lib.sh && \
-	parse_latency tor_bw_small 3
-
-tor_bw_full:
-	./run-3 \
-		16,tor_bw_full . \
-		orig-client 600 1000 100, \
-		  orig-client 1200 500 100, \
-		  orig-client 6000 100 100, \
-		  orig-client 12000 50 100, \
-		  orig-client 30000 20 100 . \
-		orig-server 100, \
-		  orig-server 100, \
-		  orig-server 100, \
-		  orig-server 100, \
-		  orig-server 100. \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple
-
-tor_bw_full_parse:
-	@. parse_lib.sh && \
-	parse_latency tor_bw_full 4
-
-tor_guards_small:
-	./run-3 \
-		1,tor_guards_small . \
-		dup2-client 600 100 100 8, \
-		  dup2-client 600 100 100 8, \
-		  dup2-client 600 100 100 8, \
-		  dup2-client 600 100 100 8 . \
-		dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100. \
-		tor3 -f /etc/torrc_guard_1, \
-		  tor3 -f /etc/torrc_guard_3, \
-		  tor3 -f /etc/torrc_guard_5, \
-		  tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_guard_1, \
-		  tor3 -f /etc/torrc_guard_3, \
-		  tor3 -f /etc/torrc_guard_5, \
-		  tor3 -f /etc/torrc_simple
-
-tor_guards_full:
-	./run-3 \
-		16,tor_guards_full . \
-		dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8, \
-		  dup2-client 6000 100 100 8 . \
-		dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100, \
-		  dup2-server 8 100. \
-		tor3 -f /etc/torrc_guard_1, \
-		  tor3 -f /etc/torrc_guard_2, \
-		  tor3 -f /etc/torrc_guard_3, \
-		  tor3 -f /etc/torrc_guard_4, \
-		  tor3 -f /etc/torrc_guard_5, \
-		  tor3 -f /etc/torrc_guard_6, \
-		  tor3 -f /etc/torrc_guard_7, \
-		  tor3 -f /etc/torrc_guard_8, \
-		  tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_guard_1, \
-		  tor3 -f /etc/torrc_guard_2, \
-		  tor3 -f /etc/torrc_guard_3, \
-		  tor3 -f /etc/torrc_guard_4, \
-		  tor3 -f /etc/torrc_guard_5, \
-		  tor3 -f /etc/torrc_guard_6, \
-		  tor3 -f /etc/torrc_guard_7, \
-		  tor3 -f /etc/torrc_guard_8, \
-		  tor3 -f /etc/torrc_simple
-
-tor_guards_full_parse:
-	@. parse_lib.sh && \
-	parse_latency tor_guards_full 8
-
-tor_relays_full:
-	./run-3 \
-		16,tor_relays_full . \
-		orig-client 6000 100 100, \
-		  orig-client 6000 100 100, \
-		  orig-client 6000 100 100 . \
-		orig-server 100, \
-		  orig-server 100, \
-		  orig-server-single 100. \
-		tor3 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_single_hop
-
-tor_relays_small:
-	./run-3 \
-		1,tor_relays_small . \
-		orig-client 600 100 100, \
-		  orig-client 600 100 100, \
-		  orig-client 600 100 100 . \
-		orig-server 100, \
-		  orig-server 100, \
-		  orig-server-single 100. \
-		tor3 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_single_hop
-
-tor_relays_full_parse:
-	@. parse_lib.sh && \
-	parse_latency tor_relays_full 2
-
-thunder_configure_small:
-	./run-3 \
-		1,thunder_configure. \
-		thunder-client 600 100 100 $(link_num) 50, \
-		  thunder-client 600 100 100 $(link_num) 100, \
-		  thunder-client 600 100 100 $(link_num) 150, \
-		  thunder-client 600 100 100 $(link_num) 200, \
-		  thunder-client 600 100 100 $(link_num) 250, \
-		  thunder-client 600 100 100 $(link_num) 300, \
-		  thunder-client 600 100 100 $(link_num) 350. \
-		thunder-server $(link_num) 50 100, \
-		  thunder-server $(link_num) 100 100, \
-		  thunder-server $(link_num) 150 100, \
-		  thunder-server $(link_num) 200 100, \
-		  thunder-server $(link_num) 250 100, \
-		  thunder-server $(link_num) 300 100, \
-		  thunder-server $(link_num) 350 100. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2
-
-thunder_configure_full:
-	./run-3 \
-		16,thunder_configure. \
-		thunder-client 6000 100 100 $(link_num) 50, \
-		  thunder-client 6000 100 100 $(link_num) 100, \
-		  thunder-client 6000 100 100 $(link_num) 150, \
-		  thunder-client 6000 100 100 $(link_num) 200, \
-		  thunder-client 6000 100 100 $(link_num) 250, \
-		  thunder-client 6000 100 100 $(link_num) 300, \
-		  thunder-client 6000 100 100 $(link_num) 350. \
-		thunder-server $(link_num) 50 100, \
-		  thunder-server $(link_num) 100 100, \
-		  thunder-server $(link_num) 150 100, \
-		  thunder-server $(link_num) 200 100, \
-		  thunder-server $(link_num) 250 100, \
-		  thunder-server $(link_num) 300 100, \
-		  thunder-server $(link_num) 350 100. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_2
-
-thunder_configure_full_parse:
-	@. parse_lib.sh && \
-	parse_thunder thunder_configure 6
-
-thunder_configure_2_part:
-	./run-3 \
-	  2,thunder_configure_2. \
-	  thunder-client 9900 30 100 2 ${jmax}, \
-	    thunder-client 9900 30 100 4 ${jmax}, \
-	    thunder-client 9900 30 100 6 ${jmax}, \
-	    thunder-client 9900 30 100 8 ${jmax}, \
-	    thunder-client 9900 30 100 12 ${jmax}, \
-	    thunder-client 9900 30 100 16 ${jmax}. \
-	  thunder-server 2 ${jmax} 100, \
-	    thunder-server 4 ${jmax} 100, \
-	    thunder-server 6 ${jmax} 100, \
-	    thunder-server 8 ${jmax} 100, \
-	    thunder-server 12 ${jmax} 100, \
-	    thunder-server 16 ${jmax} 100. \
-	  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, \
-	    tor2 -f /etc/torrc_simple, \
-	    tor2 -f /etc/torrc_simple, \
-	    tor2 -f /etc/torrc_simple, \
-	    tor2 -f /etc/torrc_simple
-
-thunder_configure_2_full:
-	./run-3 \
-		16,thunder_configure_2. \
-		thunder-client 9900 30 100 2 50, \
-		  thunder-client 9900 30 100 2 150, \
-		  thunder-client 9900 30 100 2 250, \
-		  thunder-client 9900 30 100 2 350, \
-		  thunder-client 9900 30 100 2 450, \
-		  thunder-client 9900 30 100 2 550, \
-		  thunder-client 9900 30 100 2 650, \
-		  thunder-client 9900 30 100 4 50, \
-		  thunder-client 9900 30 100 4 150, \
-		  thunder-client 9900 30 100 4 250, \
-		  thunder-client 9900 30 100 4 350, \
-		  thunder-client 9900 30 100 4 450, \
-		  thunder-client 9900 30 100 4 550, \
-		  thunder-client 9900 30 100 4 650, \
-		  thunder-client 9900 30 100 6 50, \
-		  thunder-client 9900 30 100 6 150, \
-		  thunder-client 9900 30 100 6 250, \
-		  thunder-client 9900 30 100 6 350, \
-		  thunder-client 9900 30 100 6 450, \
-		  thunder-client 9900 30 100 6 550, \
-		  thunder-client 9900 30 100 6 650, \
-		  thunder-client 9900 30 100 12 50, \
-		  thunder-client 9900 30 100 12 150, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 350, \
-		  thunder-client 9900 30 100 12 450, \
-		  thunder-client 9900 30 100 12 550, \
-		  thunder-client 9900 30 100 12 650, \
-		  thunder-client 9900 30 100 16 50, \
-		  thunder-client 9900 30 100 16 150, \
-		  thunder-client 9900 30 100 16 250, \
-		  thunder-client 9900 30 100 16 350, \
-		  thunder-client 9900 30 100 16 450, \
-		  thunder-client 9900 30 100 16 550, \
-		  thunder-client 9900 30 100 16 650, \
-		  thunder-client 9900 30 100 8 50, \
-		  thunder-client 9900 30 100 8 150, \
-		  thunder-client 9900 30 100 8 250, \
-		  thunder-client 9900 30 100 8 350, \
-		  thunder-client 9900 30 100 8 450, \
-		  thunder-client 9900 30 100 8 550, \
-		  thunder-client 9900 30 100 8 650. \
-		thunder-server 2 50 100, \
-		  thunder-server 2 150 100, \
-		  thunder-server 2 250 100, \
-		  thunder-server 2 350 100, \
-		  thunder-server 2 450 100, \
-		  thunder-server 2 550 100, \
-		  thunder-server 2 650 100, \
-		  thunder-server 4 50 100, \
-		  thunder-server 4 150 100, \
-		  thunder-server 4 250 100, \
-		  thunder-server 4 350 100, \
-		  thunder-server 4 450 100, \
-		  thunder-server 4 550 100, \
-		  thunder-server 4 650 100, \
-		  thunder-server 6 50 100, \
-		  thunder-server 6 150 100, \
-		  thunder-server 6 250 100, \
-		  thunder-server 6 350 100, \
-		  thunder-server 6 450 100, \
-		  thunder-server 6 550 100, \
-		  thunder-server 6 650 100, \
-		  thunder-server 12 50 100, \
-		  thunder-server 12 150 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 350 100, \
-		  thunder-server 12 450 100, \
-		  thunder-server 12 550 100, \
-		  thunder-server 12 650 100, \
-		  thunder-server 16 50 100, \
-		  thunder-server 16 150 100, \
-		  thunder-server 16 250 100, \
-		  thunder-server 16 350 100, \
-		  thunder-server 16 450 100, \
-		  thunder-server 16 550 100, \
-		  thunder-server 16 650 100, \
-		  thunder-server 8 50 100, \
-		  thunder-server 8 150 100, \
-		  thunder-server 8 250 100, \
-		  thunder-server 8 350 100, \
-		  thunder-server 8 450 100, \
-		  thunder-server 8 550 100, \
-		  thunder-server 8 650 100. \
-		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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  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, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple, \
-		  tor2 -f /etc/torrc_simple
-
-thunder_configure_2_full_parse:
-	@. parse_lib.sh && \
-	parse_thunder thunder_configure_2 41
-
-thunder_configure_2_full_parse_bw:
-	@. parse_lib.sh && \
-	parse_thunder_bw thunder_configure_2 41
-
-thunder_configure_2_full_parse_links:
-	@. parse_lib.sh && \
-	parse_thunder_links thunder_configure_2 41 ${base_name}
-
-thunder_configure_2_full_parse_drop:
-	@. parse_lib.sh && \
-	parse_thunder_drop thunder_configure_2 41
-
-thunder_configure_2_full_parse_drop_burst:
-	@. parse_lib.sh && \
-	parse_thunder_drop_burst thunder_configure_2 41
-
-thunder_configure_2_full_parse_red:
-	@. parse_lib.sh && \
-	parse_thunder_red thunder_configure_2 41
-
-tor_just_many_latencies:
-	./run-3 \
-		2,tor_just_many_latencies . \
-		orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100, \
-		  orig-client ${count} ${interval} 100 . \
-		orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100, \
-		  orig-server ${interval} 100. \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple, \
-		  tor3 -f /etc/torrc_simple
-
-tor_just_many_latencies_parse:
-	@. parse_lib.sh && \
-	parse_latency tor_just_many_latencies 39
-
-thunder_configure_2_part_parse:
-	@. parse_lib.sh && \
-	parse_thunder thunder_configure_2 ${nrep}
-
-thunder_configure_2_part_parse_bw:
-	@. parse_lib.sh && \
-	parse_thunder_bw thunder_configure_2 ${nrep}
-
-thunder_configure_2_part_parse_links:
-	@. parse_lib.sh && \
-	parse_thunder_links thunder_configure_2 ${nrep}
-
-thunder_configure_2_part_parse_drop:
-	@. parse_lib.sh && \
-	parse_thunder_drop thunder_configure_2 ${nrep}
-
-thunder_configure_2_part_parse_drop_burst:
-	@. parse_lib.sh && \
-	parse_thunder_drop_burst thunder_configure_2 ${nrep}
-
-thunder_configure_2_part_parse_red:
-	@. parse_lib.sh && \
-	parse_thunder_red thunder_configure_2 ${nrep}
-
-thunder_guards:
-	./run-3 \
-		16,thunder_configure_2. \
-		thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250, \
-		  thunder-client 9900 30 100 12 250. \
-		thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100, \
-		  thunder-server 12 250 100. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_4, \
-		  tor2 -f /etc/torrc_guard_6, \
-		  tor2 -f /etc/torrc_guard_8, \
-		  tor2 -f /etc/torrc_guard_10, \
-		  tor2 -f /etc/torrc_guard_12, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_4, \
-		  tor2 -f /etc/torrc_guard_6, \
-		  tor2 -f /etc/torrc_guard_8, \
-		  tor2 -f /etc/torrc_guard_10, \
-		  tor2 -f /etc/torrc_guard_12. \
-		tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_4, \
-		  tor2 -f /etc/torrc_guard_6, \
-		  tor2 -f /etc/torrc_guard_8, \
-		  tor2 -f /etc/torrc_guard_10, \
-		  tor2 -f /etc/torrc_guard_12, \
-		  tor2 -f /etc/torrc_guard_2, \
-		  tor2 -f /etc/torrc_guard_4, \
-		  tor2 -f /etc/torrc_guard_6, \
-		  tor2 -f /etc/torrc_guard_8, \
-		  tor2 -f /etc/torrc_guard_10, \
-		  tor2 -f /etc/torrc_guard_12
-
 lightning-base:
 	./run-3 \
 		1,lightning_base. \
@@ -751,4 +47,63 @@ lightning-scheduler-effect:
 tor2-pkt-per-sec:
 	./run-3 \
 		32,tor2_pkt_per_sec. \
-		orig-client 1000 1 172, \
+		orig-client 60 1000 172, \
+		orig-client 120 500 172, \
+		orig-client 240 250 172, \
+		orig-client 360 166 172, \
+		orig-client 480 125 172, \
+		orig-client 600 100 172, \
+		orig-client 722  83 172, \
+		orig-client 845  71 172, \
+		orig-client 952  63 172, \
+		orig-client 1071 56 172, \
+		orig-client 1200 50 172, \
+		orig-client 1333 45 172, \
+		orig-client 1463 41 172, \
+		orig-client 1579 38 172, \
+		orig-client 1714 35 172. \
+		orig-server 60 1000 172, \
+		orig-server 120 500 172, \
+		orig-server 240 250 172, \
+		orig-server 360 166 172, \
+		orig-server 480 125 172, \
+		orig-server 600 100 172, \
+		orig-server 722  83 172, \
+		orig-server 845  71 172, \
+		orig-server 952  63 172, \
+		orig-server 1071 56 172, \
+		orig-server 1200 50 172, \
+		orig-server 1333 45 172, \
+		orig-server 1463 41 172, \
+		orig-server 1579 38 172, \
+		orig-server 1714 35 172. \
+		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, \
+		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, \
+		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, \
+		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. \