Editor fixes and more work