Added error sampler and cleaned up other samplers