diff --git a/fuzzers/051-pip-imuxlout/generate.tcl b/fuzzers/051-pip-imuxlout/generate.tcl
index a365d73a..1cdcbb7a 100644
--- a/fuzzers/051-pip-imuxlout/generate.tcl
+++ b/fuzzers/051-pip-imuxlout/generate.tcl
@@ -88,13 +88,13 @@ for {set idx 0} {$idx < [llength $todo_lines]} {incr idx} {
     }
 }
 
-proc write_txtdata {filename} {
+proc write_txtdata {filename tiles} {
     puts "Writing $filename."
     set fp [open $filename w]
     set all_pips [lsort -unique [get_pips -of_objects [get_nets -hierarchical]]]
     if {$all_pips != {}} {
         puts "Dumping pips."
-        foreach tile [get_tiles [regsub -all {CLBL[LM]} [get_tiles -of_objects [get_sites -of_objects [get_pblocks roi]]] INT]] {
+        foreach tile $tiles {
             foreach pip [filter $all_pips "TILE == $tile"] {
                 set src_wire [get_wires -uphill -of_objects $pip]
                 set dst_wire [get_wires -downhill -of_objects $pip]
@@ -110,4 +110,13 @@ proc write_txtdata {filename} {
 route_design
 write_checkpoint -force design.dcp
 write_bitstream -force design.bit
-write_txtdata design.txt
+
+# quick: only analyze manually routed tiles, skipping riscv and such
+if {[info exists ::env(QUICK) ] && "$::env(QUICK)" == "Y"} {
+    set lim [expr [llength $todo_lines] - 1]
+    set tiles [concat [lrange $int_l_tiles 0 $lim] [lrange $int_r_tiles 0 $lim]]
+} else {
+    set tiles [get_tiles [regsub -all {CLBL[LM]} [get_tiles -of_objects [get_sites -of_objects [get_pblocks roi]]] INT]]
+}
+
+write_txtdata design.txt $tiles
diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk
index a6647cda..08f3fa38 100644
--- a/fuzzers/int_loop.mk
+++ b/fuzzers/int_loop.mk
@@ -1,6 +1,8 @@
+TODO_N ?= 10
 # Number of spcimens
 ifeq ($(QUICK),Y)
-N ?= 1
+N = 1
+TODO_N = 3
 SEGMATCH_FLAGS=
 else
 # Should be at least the -m value
@@ -11,7 +13,6 @@ endif
 # Driven by int_loop.sh
 ITER ?= 1
 MAKETODO_FLAGS ?=
-TODO_N ?= 10
 PIP_TYPE?=pips_int
 PIPLIST_TCL?=$(XRAY_DIR)/fuzzers/piplist.tcl
 
diff --git a/fuzzers/piplist.tcl b/fuzzers/piplist.tcl
index 4266f89a..f8398cce 100644
--- a/fuzzers/piplist.tcl
+++ b/fuzzers/piplist.tcl
@@ -1,39 +1,51 @@
-create_project -force -part $::env(XRAY_PART) piplist piplist
-
-read_verilog $::env(XRAY_DIR)/fuzzers/piplist.v
-synth_design -top top
-
-set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports i]
-set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_01) IOSTANDARD LVCMOS33" [get_ports o]
-
-create_pblock roi
-resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)"
-
-set_property CFGBVS VCCO [current_design]
-set_property CONFIG_VOLTAGE 3.3 [current_design]
-set_property BITSTREAM.GENERAL.PERFRAMECRC YES [current_design]
-
-place_design
-route_design
-
-write_checkpoint -force piplist.dcp
-
 source "$::env(XRAY_DIR)/utils/utils.tcl"
 
-proc print_tile_pips {tile_type filename} {
-    set tile [lindex [get_tiles -filter "TYPE == $tile_type"] 0]
-    puts "Dumping PIPs for tile $tile ($tile_type) to $filename"
-    set fp [open $filename w]
-    foreach pip [lsort [get_pips -filter {IS_DIRECTIONAL} -of_objects [get_tiles $tile]]] {
-        set src [get_wires -uphill -of_objects $pip]
-        set dst [get_wires -downhill -of_objects $pip]
-        if {[llength [get_nodes -uphill -of_objects [get_nodes -of_objects $dst]]] != 1} {
-            puts $fp "$tile_type.[regsub {.*/} $dst ""].[regsub {.*/} $src ""]"
-        }
-    }
-    close $fp
+proc build_project {} {
+    create_project -force -part $::env(XRAY_PART) piplist piplist
+
+    read_verilog $::env(XRAY_DIR)/fuzzers/piplist.v
+    synth_design -top top
+
+    set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports i]
+    set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_01) IOSTANDARD LVCMOS33" [get_ports o]
+
+    create_pblock roi
+    resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)"
+
+    set_property CFGBVS VCCO [current_design]
+    set_property CONFIG_VOLTAGE 3.3 [current_design]
+    set_property BITSTREAM.GENERAL.PERFRAMECRC YES [current_design]
+
+    place_design
+    route_design
+
+    write_checkpoint -force piplist.dcp
 }
 
-print_tile_pips INT_L pips_int_l.txt
-print_tile_pips INT_R pips_int_r.txt
-puts "Done"
+proc dump_pips {} {
+    proc print_tile_pips {tile_type filename} {
+        set tile [lindex [get_tiles -filter "TYPE == $tile_type"] 0]
+        puts "Dumping PIPs for tile $tile ($tile_type) to $filename"
+        set fp [open $filename w]
+        foreach pip [lsort [get_pips -filter {IS_DIRECTIONAL} -of_objects [get_tiles $tile]]] {
+            set src [get_wires -uphill -of_objects $pip]
+            set dst [get_wires -downhill -of_objects $pip]
+            if {[llength [get_nodes -uphill -of_objects [get_nodes -of_objects $dst]]] != 1} {
+                puts $fp "$tile_type.[regsub {.*/} $dst ""].[regsub {.*/} $src ""]"
+            }
+        }
+        close $fp
+    }
+
+    print_tile_pips INT_L pips_int_l.txt
+    print_tile_pips INT_R pips_int_r.txt
+    puts "Done"
+
+}
+
+proc run {} {
+    build_project
+    dump_pips
+}
+
+run