Updated comments from todd and some xml stuff