Turned some more stuff into links