Added more tweeks and comments
Modified Makefile