Some Makefile fixes and removed config.h