bugfix and i18n