More clarifications, more editorial improvements