Reorganized and commented Makefile.  Its dag was completely messed up.