fixed most all the migration. Still some errors in the db fix.