Fixing underscored names issue; adding ancestry information for each node to optimize subtree queries.