Updates to Makefile and README