Cleaned up a bit of templates, fixed the IE xml parsing issue