fix some relationship stuff