updated Makefile, some cleaning