Patch a bunch of minor issues up and work on the migration flow starter so I can publish it tomorrow #shipnix