quick fixes in pokerscorer + code clean-up