fixes in generics
towards more adapters
latest cthul-matcheres version