fix and translations
added state
merged with origin