add i18n and make it consequent throughout