added a few more bst fxns
resolved conflicts in tree