A few more tweaks, fixed broken links