did some changes to the addLink, and settings