Fix allowing rows to go off the right of the screen, and fix exception when trying to fulfill malformed swaps