fixed many match bugs, still can't work