Adding more MCMC enhancements to do single source + noise