Fixed some issues with GS transfer counting.
Cleanup.