Topped off more questions and cleaned up the makefile