Change occurences of s_mv->sigma_mv. Fixed some plotting.