timeout; minor changes