Updated count bug in match parser section + finalized the parser class