cleanup ACK handling, move ACK'ed packets to current
more cleanup and fixes for ACK handling for escrow payments