Minor tweaks and links