Enhanced Makefile and output