Fixed some unescape errors, etc.