Updated makefile and comments