ADSR Envelope + other updates