fixes to units and labels