timeout fix and starting/waiting fix