updated i18n and comments