clean up samples a bit and add more