diff --git a/Makefile b/Makefile
index 47f9ff6c..d8099808 100644
--- a/Makefile
+++ b/Makefile
@@ -98,17 +98,18 @@ chibi-scheme-static$(EXE): main.o eval.o sexp.o
 	$(CC) $(XCFLAGS) $(STATICFLAGS) -o $@ $^ $(XLDFLAGS)
 
 %.c: %.stub chibi-scheme$(EXE) $(GENSTUBS)
-	$(GENSTUBS) $<
+	LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) $(GENSTUBS) $<
 
 lib/%$(SO): lib/%.c $(INCLUDES)
 	$(CC) $(CLIBFLAGS) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< -L. -lchibi-scheme
 
 clean:
 	rm -f *.o *.i *.s *.8
-	find lib -name \*.$(SO) -exec rm -f '{}' \;
+	find lib -name \*$(SO) -exec rm -f '{}' \;
+	rm -f tests/basic/*.out tests/basic/*.err
 
 cleaner: clean
-	rm -f chibi-scheme$(EXE) chibi-scheme-static$(EXE) $(COMPILED_LIBS) *$(SO) *.a
+	rm -f chibi-scheme$(EXE) chibi-scheme-static$(EXE) $(COMPILED_LIBS) *$(SO) *.a include/chibi/install.h
 	rm -rf *.dSYM
 
 test-basic: chibi-scheme$(EXE)
@@ -122,13 +123,13 @@ test-basic: chibi-scheme$(EXE)
 	done
 
 test-numbers: all
-	LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./chibi-scheme$(EXE) tests/numeric-tests.scm
+	LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./chibi-scheme$(EXE) tests/numeric-tests.scm
 
 test-match: all
-	LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./chibi-scheme$(EXE) tests/match-tests.scm
+	LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./chibi-scheme$(EXE) tests/match-tests.scm
 
 test: all
-	LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./chibi-scheme$(EXE) tests/r5rs-tests.scm
+	LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./chibi-scheme$(EXE) tests/r5rs-tests.scm
 
 install: chibi-scheme$(EXE)
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -139,16 +140,19 @@ install: chibi-scheme$(EXE)
 	mkdir -p $(DESTDIR)$(INCDIR)
 	cp $(INCLUDES) include/chibi/eval.h $(DESTDIR)$(INCDIR)/
 	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(SOLIBDIR)
+	cp libchibi-scheme$(SO) $(DESTDIR)$(SOLIBDIR)/
 	cp libchibi-scheme$(SO) $(DESTDIR)$(SOLIBDIR)/
 	-cp libchibi-scheme.a $(DESTDIR)$(LIBDIR)/
 	if type ldconfig >/dev/null 2>/dev/null; then ldconfig; fi
 
 uninstall:
-	rm -f $(BINDIR)/chibi-scheme*
-	rm -f $(SOLIBDIR)/libchibi-scheme$(SO)
-	rm -f $(LIBDIR)/libchibi-scheme$(SO).a
-	cd $(INCDIR) && rm -f $(INCLUDES) include/chibi/eval.h
-	rm -rf $(MODDIR)
+	rm -f $(DESTDIR)$(BINDIR)/chibi-scheme$(EXE)
+	rm -f $(DESTDIR)$(BINDIR)/chibi-scheme-static$(EXE)
+	rm -f $(DESTDIR)$(SOLIBDIR)/libchibi-scheme$(SO)
+	rm -f $(DESTDIR)$(LIBDIR)/libchibi-scheme$(SO).a
+	cd $(DESTDIR)$(INCDIR) && rm -f $(INCLUDES) include/chibi/eval.h
+	rm -rf $(DESTDIR)$(MODDIR)
 
 dist: cleaner
 	rm -f chibi-scheme-`cat VERSION`.tgz
diff --git a/include/chibi/config.h b/include/chibi/config.h
index 10836648..61dd03b2 100644
--- a/include/chibi/config.h
+++ b/include/chibi/config.h
@@ -29,8 +29,8 @@
 
 /* uncomment this to just malloc manually instead of any GC */
 /*   Mostly for debugging purposes, this is the no GC option. */
-/*   You can use the just with the read/write API and */
-/*   explicitly free sexps though. */
+/*   You can use just the read/write API and */
+/*   explicitly free sexps, though. */
 /* #define USE_MALLOC 1 */
 
 /* uncomment this to add conservative checks to the native GC */
@@ -58,7 +58,7 @@
 /* #define USE_INFINITIES 0 */
 
 /* uncomment this if you want immediate flonums */
-/*   This is experimental, enablde at your own risk. */
+/*   This is experimental, enable at your own risk. */
 /* #define USE_IMMEDIATE_FLONUMS 1 */
 
 /* uncomment this if you don't want bignum support */