I18n + minors corrections