More updates to network code