small #12 improvements + i18n