merging manually from branch 223_UpdateEditor_55_Notebooks

I've manually and fairly painstakingly merged my work from the other branch into this branched from master so I think it should be fairly safe to merge back into master.