Updated undo table thing
Merge changes
Fix flag changes for redo