Massive fixes to editing.