Mostly fixed tree redrawing. A very painful last couple of days.