Include more generator variables in tree
Fix printout in diobject and a few smaller updates