fixing offline buffering and handling disconenct differently