improve late ack management
some more bug fixes