More Makefile fixes and readme update