fixed player, redid associations