fixed some escaping issues