enhanced some xml stuff