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

What? Check main(), policy is destroyed there, I think it was even you that coded it...