Many improvements to the editor