minor additions to visitor