code cleanup and addition of t2s to make dumping trees easier to type