new fixes, link and remove duplication of messages