Whitespace fixes
Adds missing ","
Adds escaping of CDATA elements