fixup! wip-editor
WIP: minor cleanups