#419, #420: improve other links
#419, #420: tidy