some fixes from AM + changes in calculators (materials and color)