edited model associations
modified comments