Move FairBalancer; small updates based on feedback