undo almost done, failing on some actions