Fix hyperlinks along with some minor changes