try to rectify bugs in the timeout code.  man, timeouts are always
tricky