Update config and makefile