further editor enhancements