Fix some FR control plots; fix bug in JetXPt methods; other corrections I don't remember