makefile added, some fixes