More accurate title, added links