batch : message replay & some bug fixes