More fixes to whatever this is.

P.S. Tree is now populated, hooray.