network improvements
Merge branch 'network_improvements'