net: improvements
More cleanups & fixes