Added expanded commenting and set for link deduplication