And fix string escaping I hope