Some updates to the editor code