More Progress fixing and improving performance of Undo Operations