Multi Line Envelope plus fixes