A bit of cleaning :) found one full method not implemented, it’s working better already