Added compsition to select plot label. Change CalcParams to all lists so can keep old values.