i18n and bugfix