escaping improvements