Editing

Editing merged with latest master; all tests working, all pages tested.