Simplified attack + decay envelope
Minor fixes