type in Makefile and some changes