correct Makefile and other.