Update treewalker

Fixed a couple bugs