Various editor-related changes/additions