fixed tree, slow network notif etc.
merged with origin