Updates to makefile