Close #43

Multiple i18n fixes