Mid-dev undo redo plus some fixes in xmlBuilder