Added more to the Makefile
Added the professor's changes