Fix broken links and small modifications