Updating migration for latest data. Also fixing a few migration glitches.