some more cleanup of labels. Recompiled all formulas.