fixing up model relations