diff --git a/toys/checkextensions b/toys/checkextensions
index 585d48c..21994ef 100755
--- a/toys/checkextensions
+++ b/toys/checkextensions
@@ -41,12 +41,13 @@ do
 	source "$function"
 done
 
-while getopts 'urn' opt
+while getopts 'urnD' opt
 do
 	case $opt in
 		u)	update=1	;;
 		r)	rename=1	;;
 		n)	pretend=1	;;
+		D)	(( debug++ ))	;;
 	esac
 done
 
@@ -72,8 +73,12 @@ renameFile() {
 	echo $'\t'"${filename%.*}$extension"
 	if ! (( pretend ))
 	then
-		mv "$sourcepath/$filename" "$sourcepath/${filename%.*}$extension"
-		Update source_files filename "${filename%.*}$extension"
+		mv						\
+			"$sourcepath/$filename"			\
+			"$sourcepath/${filename%.*}$extension"	\
+		&& Update source_files filename "${filename%.*}$extension"<<-EOW
+			id = $fileid
+		EOW
 	fi
 }
 
@@ -83,6 +88,10 @@ do
 	then
 		break
 	fi
+	lines+=("$line")
+done
+for line in "${lines[@]}"
+do
 	fileid=${line%%|*}
 	rest="${line#*|}|"
 	filename=${rest%%|*}