More Save()'s missing and removes the extra calls to XmlGenerate - should save some processing time.