More i18n and cosmetics
More i18n