some changes to Makefile