more models and some fixes in external weighting of the likelihood