Tweaks and adding links