More accurate title, added links

Messed up the first pull request, this one should be better...