- state machine cleanup and card selection working