more consistent order of parameters in Gamma_vv_sts and raw_Gamma_vv_sts
more consistent order of parameters in Gamma_22_sts