i18n changes
fixing i18n use, fixing setup