minor changes including socket timeout