More work on poker evaluator