fixed a bunch of weird revert problems