Fix up README.md
Makefile updates