fix hetero vol & add non-uniform vol sampler