Added some more escaping, and updated some of the formatting.