Fixed two major bugs in scrub and added more of the tree.