Escaping fixes. Closes #3