work on likeluhoods and likelihoods tests
tidying in likelihoods
manual merging
very weird merge conflict, including in files that I did not change