Makefile updated, minor updates