Wrap environment in boxes
Attempt bugfixes