fast sampler and makefile cleanup