fixed associations because i'm stupid