clean up templates, use CDATA in descriptions.