Fixed issue #54 before Phelan becuase we raced to do it. But its ok because we all love him even if he lost.
merged with ethan's scores display fix (issue #54 solved). also fixed merge conflicts