some comment changes and cleaning up makefile