Updates from Zack Katz. Language updates and some escaping.