cleanup, sync, more logging
Change criteria for resending on NACK to match comment
bump for moar testin'