Modified Makefile and associated docs