diff --git a/Makefile.in b/Makefile.in
index 8ba607f..0af7879 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ mandir = $(prefix)/man/man$(manext)
 #   LDFLAGS = -N
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir)/c -I$(srcdir)/cig $(CFLAGS) -o $@ $<
+	$(CC) -g -c $(CPPFLAGS) $(DEFS) -I$(srcdir)/c -I$(srcdir)/cig $(CFLAGS) -o $@ $<
 
 # You might want to change RUNNABLE to "s48"
 RUNNABLE = scsh06
@@ -396,7 +396,9 @@ clean-cig:
 
 clean-scm2c:
 	rm -f scsh/flock.c  scsh/network.c scsh/rdelim.c \
-	scsh/re.c scsh/select.c scsh/syscalls.c scsh/tty.c scsh/time.c 
+	scsh/select.c scsh/syscalls.c scsh/tty.c scsh/time.c \
+	scsh/sighandlers.c scsh/rx/re-low.c
+
 
 #JMG: moved config.cache to distclean
 distclean: clean
@@ -662,7 +664,7 @@ i-know-what-i-am-doing:
 		echo ',exec ,load compile-vm-no-gc.scm';		     \
 		echo ',exec ,load compile-gc.scm';			     \
 		echo ',exit'						     \
-	) | $(RUNNABLE) -h 8000000 &&					     \
+	) | $(RUNNABLE) -h 5000000 &&					     \
 		mv ../scheme/vm/scheme48vm.c ../scheme/vm/scheme48heap.c ../c
 cig: $(CIG) $(CIG).image $(LIBCIG)
 
@@ -679,7 +681,7 @@ $(CIG): $(VM) $(IMAGE) $(srcdir)/cig/cig.scm $(srcdir)/cig/libcig.scm
 	| ./$(VM) -i ./$(IMAGE)
 	$(srcdir)/cig/image2script $(LIB)/$(VM) </tmp/cig > $(CIG)
 	-chmod +x $(CIG)
-	mv /tmp/cig $(srcdir)/cig/standalone.image	
+	mv /tmp/cig $(srcdir)/cig/cig_bootstrap	
 	$(RM) /tmp/cig
 
 $(CIG)2:
@@ -723,6 +725,7 @@ SCHEME =scsh/awk.scm \
 	scsh/endian.scm \
 	scsh/enumconst.scm \
 	scsh/event.scm \
+	scsh/low-interrupt.scm \
 	scsh/fdports.scm \
 	scsh/fileinfo.scm \
 	scsh/filemtch.scm \
@@ -828,7 +831,6 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",load-package string-lib"; \
 	 echo ",load-package ccp-lib"; \
 	 echo ",in scsh-level-0"; \
-	 echo "(init-scsh-signal)";\
 	 echo ",user"; \
 	 echo ",open floatnums"; \
 	 echo ",open scsh"; \
@@ -837,6 +839,7 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",open scsh-top-package"; \
 	 echo ",keep names maps files source tabulate"; \
 	 echo ",dump scsh06.image"; \
+	 echo ",keep names maps files source tabulate"; \
 	 echo "(dump-scsh \"scsh/scsh.image\")"; \
 	 echo ",batch on") \
 	| ./$(VM) -o ./$(VM) -i $(CIG).image -h 10000000