Mostly reverts and some additions to the migration spreadsheet