Makefiles cleanup and minor changes to the readme.