some more work on editor
refactoring editor