Makefile added, some changes