adjusting names and other links