Some test tweaks. DRAFT.
Some debug tweaks, fix cur.buffer switching
Fix for transfers cancel and some debug tweaks. DRAFT
Cleanup and some tweaks. DRAFT