fixes #23, fixes #24, fixes #25, plus misc other improvements to wip treebanking support