minor adjustments to tpvisitor