add/fix context managers