fix Makefile and guile.scm