filled out model associations, fixed minor things
lots of stuff