fixing names and links