more improvaments to make it work better

then it should be part of the adapter, don't see any reason why keep it here if its not used here