diff --git a/Makefile b/Makefile
index 001e90c5..ffbd1fa7 100644
--- a/Makefile
+++ b/Makefile
@@ -110,12 +110,13 @@ install: chibi-scheme$(EXE)
 	mkdir -p $(DESTDIR)$(BINDIR)
 	cp chibi-scheme$(EXE) $(DESTDIR)$(BINDIR)/
 	mkdir -p $(DESTDIR)$(MODDIR)
-	cp init.scm $(DESTDIR)$(MODDIR)/
+	cp init.scm config.scm $(DESTDIR)$(MODDIR)/
+	cp -r lib/ $(DESTDIR)$(MODDIR)/
 	mkdir -p $(DESTDIR)$(INCDIR)
 	cp $(INCLUDES) include/chibi/eval.h $(DESTDIR)$(INCDIR)/
 	mkdir -p $(DESTDIR)$(LIBDIR)
 	cp libchibi-scheme$(SO) $(DESTDIR)$(SOLIBDIR)/
-	-cp libchibi-scheme$(SO).a $(DESTDIR)$(LIBDIR)/
+	-cp libchibi-scheme.a $(DESTDIR)$(LIBDIR)/
 	if type ldconfig >/dev/null 2>/dev/null; then ldconfig; fi
 
 uninstall:
@@ -123,7 +124,7 @@ uninstall:
 	rm -f $(SOLIBDIR)/libchibi-scheme$(SO)
 	rm -f $(LIBDIR)/libchibi-scheme$(SO).a
 	cd $(INCDIR) && rm -f $(INCLUDES) include/chibi/eval.h
-	rm -f $(MODDIR)/*.scm
+	rm -rf $(MODDIR)
 
 dist: cleaner
 	rm -f chibi-scheme-`cat VERSION`.tgz
diff --git a/config.scm b/config.scm
index a62e3e4e..8bd17f2f 100644
--- a/config.scm
+++ b/config.scm
@@ -4,7 +4,7 @@
 
 (define *modules* '())
 (define *this-module* '())
-(define *load-path* (list "./lib" *module-directory*))
+(define *load-path* (list "./lib" (string-append *module-directory* "/lib")))
 
 (define (make-module exports env meta) (vector exports env meta))
 (define (module-exports mod) (vector-ref mod 0))
diff --git a/eval.c b/eval.c
index 78a67b82..86ab276f 100644
--- a/eval.c
+++ b/eval.c
@@ -110,6 +110,7 @@ static sexp extend_env (sexp ctx, sexp env, sexp vars, sexp value) {
   return e;
 }
 
+#if 0
 static sexp sexp_chain_env (sexp ctx, sexp env1, sexp env2) {
   sexp_gc_var1(res);
   sexp_gc_preserve1(ctx, res);
@@ -123,6 +124,7 @@ static sexp sexp_chain_env (sexp ctx, sexp env1, sexp env2) {
   sexp_gc_release1(ctx);
   return res;
 }
+#endif
 
 static sexp sexp_reverse_flatten_dot (sexp ctx, sexp ls) {
   sexp_gc_var1(res);