Lots of bug fixes. Testing Envelope responses currently