fix some bug and i18n