Makefile updated a bit