More revising to choreographies
Still more changes