lots of restored editing functionality