corrected joint-marginal-conditional (I think)