Fix check_match
Fix create_grid