Fixed Escape Characters

- Fixed some issues with some characters not properly escaped.