Scottstamp stale links pr carry

squash and carry @scottstamp's PR #9646

and then fix the other things his script found.
na, that was just something i had when i was testing - so i could view the pages - that turned out to be pointless :)