get everything but sampler compiling again, and seemingly working, though I need to valgrind variants and puncher