Incremental improvements to editor.