Fix a minor Escape() bug

Also add a regression test.
Minor documentation improvements