minor changes to network handling