Makefile + some changements in the implementation