Fix mixing / modulation behaviour, add some  more buffer safeguards