l10n fixes and improvements