small fixes in the waiting time intervals