Imrpove the Makefile