Fixed NetworkServer.Stop sometimes never returning. Some code tidy-ups.