Worked on Makefile some more.