Diff minimization, doc tweaks