zrapswap, bugfixes and DataSwap v2 compatibility