Add collector for marginals at each point

and also add debug option to sample/resample data