Improve error reporting for windows network state

Also general bugfixes from testing.