still fixing string escaping