editor fixes and cleanups