fix escaping bugs and spacing