even more tweaks, to fix i18n and message length for differing languages