Update Makefile
More tidying up
Update README.md