Many improvements to editing functionality