Network corrections

Fixed several issues with the network but there are still more to go.