migration - fixed some relationship stuff