Bug fixes
Adjust redo order.
Bug Fixes