tweaking escape behavior and updating docs