sampler improvements