data dispatch job & other small modifications