More editor fixes and improvements