Merge branch 'refactor_likelihood_pf' into 'refactor_likelihood'

small fixes

See merge request !3
2 jobs for refactor_likelihood in 17 minutes and 49 seconds (queued for 2 seconds)