Fixed bug for multiple mixtures + tweaks.