[IMP] i18n
[IMP] various fixes