fixed bug and improved i18n