Commented 'envelopes.oz'
Changed End to Next in 'mix.oz' for consistency