Simple doc, Makefile, and cherry-pick error fixes.