Updated the emcee wrapper function etc.