fixed some of the one-to-one relationships which should be foreign key instead