final i18n fixes and minor bugfix