Added some changes to the Makefile