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

I still call this a leak that you're adding.