relocate i18n +fix some quality issues