Updated makefile, minor README changes