fixed multiple witness comment tracking. added to builder outplut