work on i18n and fix bugs