Committ...just for fun
Updated count error in match parser section + finalized parser class.