Multiple tweaks regarding the sampling and deterministic sources (BWM works?)