Lots of changes to the editor