fixing tree growth, doing some more polishing of the frontend
merge problem?