Improvements to editor