Some updates, maybe closing in on joint likelihood (without distance...

Some updates, maybe closing in on joint likelihood (without distance marginalization; will test next