WIP fake-editor: split into output improvements; merge & goto