minor modifications in network code