minor changes to the tree walker