changed environment superclass a bit
merged conflicts, maybe
fixed quotation mark issue