Verified that descriptors are working and fixed matching issues.