more conservative configuration file
two little fixes in Makefile