More tweaks to poker logic