Updated a few links, terms, formatting