Misc. tweaks on Editors and minor refactoring.