Simple editor fixes
merge with master