More improvements to tree model.