some fixen in the network code