[wip] more equilibration fixes