Makefile and some changes