- latest fixes and i18n