Fixed churn code so that audits match
Misc changes
Misc changes