did a bunch of fixup of migrations