fix broken xml support & add undo