More parameter options, fix infinite loop on mixture modelling