Makefile fix + comments