Few bug fixes. Tested on all network disruptions!