Debugging and improved CXI tree.