Enhance/update makefile