changed some assoc types and added some extra models