some more minor fixes/changes (socket.timeout, send, etc.)