more editor improvements