Improvements to editor; introduce ON_PROGRESS