some changes, improvements and refacoring in network subsystem