solving issues and mainly fix some i18n