Fade in/out improvments and fixes...  and incidental fixes to envelopes...