Various tweaks, fixed a network subsystem bugs