Updated formatting, added links