Improvements to 2xx retransmission behaviour

Fixes #131