fixes to escaping