You are totally correct about the Queen and Rook, so I modified the tables a little bit. Now you only need a two pair to move Rook and three of a kind will move Queen. Thanks for the feedback!
