Clean up the sampler stuff.. And found a bug!
Sampler bugfix