Fixed link and some names