#15:  Several changes from testing

Added tracing code, changed settings, added checks for null when
computing depth of tree/sub-tree