Updated a number of links and formatting