Added Straight checking and improved Flush checking