Fixed hyperlinks and refine wordings