Add comments and cleanup matcher classes and new profile methods (match)