comment tweaks
implemented socket timeout
ecluding timeout from streaming client