Some work on Makefile