A few minor fixes to sampling... seems to work now for the base case