Fix order of xml vs non-xml updates. Don't move amdpar when it's a different cfr part.
Merge pull request #217 from cmc333333/order-issues

Tweaks to resolve some regressions