Comparator XML fixes, as well as Comparator tree and object bug fixes