config & makefile update