Final commit. Changed Makefile args, changed some comments