some i18n and some patches