Brandon has put together a much-upgraded P&H.
There are possibly things still missing, but this should be good enough.
For the future we need to work out something new with regards to how grants are handled; the P&H is looking like a less-than-ideal option when it comes to one-time grants (permanent grants are cool, but not the others).
The same goes for pillage and extra income; those two will be added directly into your processed DO and/or secrets updates from now on.