Removed useless comments from Match, added extensions