improved markup, better insert editing