changed some OnToOneFields to ForeignKey fields