finished some more migration stuff