fixing up some bitswap stuff after the PR