Fixed a single-line block bug
Fixed escaping issues