more bug fixes and updates to Visitor object