Final changes to Makefile, will add comments back