Makefile and slight corrections