More ToString changes to aid debugging