Fix scoring for pairs,trips, full, and quads

fixes #1