Finish multi-editor demo

Also fixed a few newly discovered bugs