fixed dups link, cleaned up messaging