fix few bugs and i18n