TODO update, MrTree behaviour improvements