fixed most of the relationships