Work on fixing mixture models

@sofia.kaisaridi this is my investigations in trying to fix your mixture model. I haven't finished but this might give you some ideas to experiment on your side.