Envelope Instrumentation and some cleanup