refactor, bug fixing, i18n