Fix a lot of URLs
Merge branch 'sharils' into wip