diff --git a/fuzzers/056-rempips/.gitignore b/fuzzers/056-rempips/.gitignore
index 0c1760e4..a747a2b4 100644
--- a/fuzzers/056-rempips/.gitignore
+++ b/fuzzers/056-rempips/.gitignore
@@ -1,3 +1,3 @@
 build
 run.ok
-
+todo
diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile
index 47567eb4..4a0fa62f 100644
--- a/fuzzers/056-rempips/Makefile
+++ b/fuzzers/056-rempips/Makefile
@@ -24,19 +24,25 @@ build/pips_int_l.txt: piplist.tcl
 # Used 1) to see if we are done 2) pips to try in generate.tcl
 build/todo.txt: build/pips_int_l.txt
 	#python3 maketodo.py --no-strict | sort -R | head -n10 > build/todo.txt.tmp
-	python3 maketodo.py --no-strict | sort -R | head -n10 > build/todo.txt.tmp
+	python3 maketodo.py --no-strict >build/todo_all.txt
+	cat build/todo_all.txt | sort -R | head -n10 > build/todo.txt.tmp
 	mv build/todo.txt.tmp build/todo.txt
 
 
 # XXX: conider moving to script
 run:
 	\
-	    +set -ex; \
+        set -ex; \
+        make clean; \
+        mkdir -p todo; \
         while \
-            make clean; \
+            make cleanprj; \
             make build/todo.txt || exit 1; \
             test -s build/todo.txt; \
         do \
+            i=$$((i+1)); \
+            cp build/todo.txt todo/$${i}.txt; \
+            cp build/todo_all.txt todo/$${i}_all.txt; \
             if make database; then \
                 make pushdb; \
             fi; \
@@ -45,7 +51,11 @@ run:
 	touch run.ok
 
 clean:
-	rm -rf build run.ok
+	rm -rf build run.ok todo
 
-.PHONY: database pushdb run clean
+# Remove iteration specific files, but keep piplist.tcl output
+cleanprj:
+	rm -rf build/specimen_* build/todo.txt build/*.db
+
+.PHONY: database pushdb run clean cleanprj
 
diff --git a/fuzzers/056-rempips/generate.sh b/fuzzers/056-rempips/generate.sh
index 60b0c180..ec525cf8 100644
--- a/fuzzers/056-rempips/generate.sh
+++ b/fuzzers/056-rempips/generate.sh
@@ -3,8 +3,8 @@
 FUZDIR=$PWD
 source ${XRAY_GENHEADER}
 
-vivado -mode batch -source ../generate.tcl
+vivado -mode batch -source $FUZDIR/generate.tcl
 
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
-python3 ../generate.py
+python3 $FUZDIR/generate.py