Fix if statement for match_time. Fix some grammar