Updated XML to be more single point of failure.  XML now escapes characters.

This is primarily to fix items with bad characters in their names.