Makefile and readme changes