add dwell times and rescale some expectations