Revisions to update function for mixtures. Still not totally done.