fixn up the playa and scores
fixed merge conflicts