validation and i18n changes