Updated Makefile some