+added Makefile and some fixes