More Editor and Node refactoring.