minor link and message template changes