Limit on in transit packets; Some minor improvements