diff --git a/scripts/Makefile b/scripts/Makefile
index 3d13f2a..50e2ecf 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -230,47 +230,63 @@ thunder_configure_full_parse:
 
 thunder_configure_2_full:
 	./run-3 \
-		8,thunder_configure_2. \
+		1,thunder_configure_2. \
 		thunder-client 9900 30 100 2 50, \
 		  thunder-client 9900 30 100 2 150, \
+		  thunder-client 9900 30 100 2 200, \
 		  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 4 50, \
 		  thunder-client 9900 30 100 4 150, \
+		  thunder-client 9900 30 100 4 200, \
 		  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 6 50, \
 		  thunder-client 9900 30 100 6 150, \
+		  thunder-client 9900 30 100 6 200, \
 		  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 8 50, \
 		  thunder-client 9900 30 100 8 150, \
+		  thunder-client 9900 30 100 8 200, \
 		  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 450, \
+		  thunder-client 9900 30 100 8 550. \
 		thunder-server 2 50, \
 		  thunder-server 2 150, \
+		  thunder-server 2 200, \
 		  thunder-server 2 250, \
 		  thunder-server 2 350, \
 		  thunder-server 2 450, \
+		  thunder-server 2 550, \
 		  thunder-server 4 50, \
 		  thunder-server 4 150, \
+		  thunder-server 4 200, \
 		  thunder-server 4 250, \
 		  thunder-server 4 350, \
 		  thunder-server 4 450, \
+		  thunder-server 4 550, \
 		  thunder-server 6 50, \
 		  thunder-server 6 150, \
+		  thunder-server 6 200, \
 		  thunder-server 6 250, \
 		  thunder-server 6 350, \
 		  thunder-server 6 450, \
+		  thunder-server 6 550, \
 		  thunder-server 8 50, \
 		  thunder-server 8 150, \
+		  thunder-server 8 200, \
 		  thunder-server 8 250, \
 		  thunder-server 8 350, \
-		  thunder-server 8 450. \
+		  thunder-server 8 450, \
+		  thunder-server 8 550. \
 		tor2 -f /etc/torrc_simple, \
 		  tor2 -f /etc/torrc_simple, \
 		  tor2 -f /etc/torrc_simple, \
@@ -290,6 +306,14 @@ thunder_configure_2_full:
 		  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, \
@@ -310,19 +334,28 @@ thunder_configure_2_full:
 		  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 19
+	parse_thunder thunder_configure_2 27
 
 thunder_configure_2_full_parse_bw:
 	@. parse_lib.sh && \
-	parse_thunder_bw thunder_configure_2 19
+	parse_thunder_bw thunder_configure_2 27
 
 thunder_configure_2_full_parse_links:
 	@. parse_lib.sh && \
-	parse_thunder_links thunder_configure_2 19
+	parse_thunder_links thunder_configure_2 27
 
 tor_just_many_latencies:
 	./run-3 \