Fix pluralizer and add links