bugfix/speed improvement to envelope.c