Faster envelope, fix wave instruments