Fix some broken links and remove some returns