Mixed some xml bugs