coded more support for matching, smb still missing