updates to the tree ADT
solved git edit conflicts