fixup and some reverts