config, makefile update - makefile fixed to push to master