Changes for editor
merged in unfinished work
editor, mostly usable