removing various todos
corrected visitor fetching