make transfer test use offsets
add comments to Cuda classes
fix merge conflict