mcmc -> inference, refactored likelihoods and split up pseudo-marginal stuff