Updated comments, makefile