fixes to editor after refactoring