fixed some more escaping issues