diff --git a/dj/Makefile b/Retired/dj/Makefile
similarity index 100%
rename from dj/Makefile
rename to Retired/dj/Makefile
diff --git a/dj/dj.1 b/Retired/dj/dj.1
similarity index 100%
rename from dj/dj.1
rename to Retired/dj/dj.1
diff --git a/dj/dj.c b/Retired/dj/dj.c
similarity index 100%
rename from dj/dj.c
rename to Retired/dj/dj.c
diff --git a/mm/Makefile b/Retired/mm/Makefile
similarity index 100%
rename from mm/Makefile
rename to Retired/mm/Makefile
diff --git a/mm/cat b/Retired/mm/cat
similarity index 100%
rename from mm/cat
rename to Retired/mm/cat
diff --git a/mm/mm.1 b/Retired/mm/mm.1
similarity index 100%
rename from mm/mm.1
rename to Retired/mm/mm.1
diff --git a/mm/mm.c b/Retired/mm/mm.c
similarity index 100%
rename from mm/mm.c
rename to Retired/mm/mm.c
diff --git a/mm/tee b/Retired/mm/tee
similarity index 100%
rename from mm/tee
rename to Retired/mm/tee
diff --git a/cbz/cbzcat b/cbz/cbzcat
index 514d010..62bad01 100755
--- a/cbz/cbzcat
+++ b/cbz/cbzcat
@@ -12,8 +12,9 @@ test -n "$2" \
 
 set -x
 
-d="$(mktemp -d)"
-mkdir "$d"/x
+d="$(mktemp -d || printf '%s/.cbzcat' "$HOME/")"
+trap 'rm -rf "$d"; trap - EXIT; exit' EXIT INT HUP
+mkdir -p "$d"/x
 
 i=1  # index
 il=1 # index length in digits
@@ -26,15 +27,6 @@ for f in "$@"; do
 	rm "$d"/x/*.xml
 
 	for g in "$d"/x/*; do
-		# move file to indexed position
-		printf '%s\n' "$g" \
-			| sed 's|^.*\.||' \
-			| xargs printf '%s/%s%s\n' "$d" "$i". \
-			| xargs mv "$g"
-
-		# increment i
-		i="$(printf '1 + %s\n' "$i" | bc)"
-
 		# if there aren't enough leading zeroes
 		if ! printf '%s' "$i" \
 				| wc -c \
@@ -48,6 +40,15 @@ for f in "$@"; do
 			# update index digit length
 			il="$(printf '1 + %s\n' "$il" | bc)"
 		fi
+
+		# move file to indexed position
+		printf '%s\n' "$g" \
+			| sed 's|^.*\.||' \
+			| xargs printf '%s/%s%s\n' "$d" "$i". \
+			| xargs mv "$g"
+
+		# increment i
+		i="$(printf '1 + %s\n' "$i" | bc)"
 	done
 done