Further work on the Editor.