Healing and i18n. was too hard to split commits, sorry