Feature/update strings final