Commenting and makefile fix