emails are updated and now include the history of the tree
fixed merge errors