Minor tweaks, before Majenerator Chiitoi fix

Fixed Kokushi waits, other tweaks. Majenerator is generating bad Chiitoi
hands.