Fix envelopes/ADSR use with DrumMachine
Add FMSynth